diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2010-04-06 18:21:21 +0800 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2010-04-06 18:21:21 +0800 |
| commit | 0e239e555149729fb536d6a48b3640b5462a2e47 (patch) | |
| tree | f82ac84fb431fbeeb0f14b74d26d9a771c185f7f | |
| parent | a8feedf3901a6db06e810f0dfd6ef370b23a2718 (diff) | |
| download | gsoc2013-evolution-0e239e555149729fb536d6a48b3640b5462a2e47.tar.gz gsoc2013-evolution-0e239e555149729fb536d6a48b3640b5462a2e47.tar.zst gsoc2013-evolution-0e239e555149729fb536d6a48b3640b5462a2e47.zip | |
[win32] #undef some conflicting defines
| -rw-r--r-- | widgets/table/e-table-group.c | 5 | ||||
| -rw-r--r-- | widgets/table/e-table-item.c | 4 | ||||
| -rw-r--r-- | widgets/table/e-table.c | 4 | ||||
| -rw-r--r-- | widgets/table/e-tree.c | 4 |
4 files changed, 17 insertions, 0 deletions
diff --git a/widgets/table/e-table-group.c b/widgets/table/e-table-group.c index 4189ae6015..9639f5a9e2 100644 --- a/widgets/table/e-table-group.c +++ b/widgets/table/e-table-group.c @@ -38,6 +38,11 @@ G_DEFINE_TYPE (ETableGroup, etg, GNOME_TYPE_CANVAS_GROUP) #define ETG_CLASS(e) (E_TABLE_GROUP_CLASS(GTK_OBJECT_GET_CLASS(e))) +#ifdef DOUBLE_CLICK +#undef DOUBLE_CLICK +#endif + + enum { CURSOR_CHANGE, CURSOR_ACTIVATED, diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c index 3c0fa33bb0..5df9ce001b 100644 --- a/widgets/table/e-table-item.c +++ b/widgets/table/e-table-item.c @@ -69,6 +69,10 @@ static void eti_cancel_drag_due_to_model_change (ETableItem *eti); realize and make sure that all of them are doable by all the cells and that all of the others are only done after realization. */ +#ifdef DOUBLE_CLICK +#undef DOUBLE_CLICK +#endif + enum { CURSOR_CHANGE, CURSOR_ACTIVATED, diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c index 5c35eb26e6..571563eba8 100644 --- a/widgets/table/e-table.c +++ b/widgets/table/e-table.c @@ -63,6 +63,10 @@ #define e_table_item_leave_edit_(x) (e_table_item_leave_edit((x))) #endif +#ifdef DOUBLE_CLICK +#undef DOUBLE_CLICK +#endif + enum { CURSOR_CHANGE, CURSOR_ACTIVATED, diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c index c093255518..1a4662859c 100644 --- a/widgets/table/e-tree.c +++ b/widgets/table/e-tree.c @@ -62,6 +62,10 @@ #define e_table_item_leave_edit_(x) (e_table_item_leave_edit((x))) #endif +#ifdef DOUBLE_CLICK +#undef DOUBLE_CLICK +#endif + enum { CURSOR_CHANGE, CURSOR_ACTIVATED, |