summaryrefslogtreecommitdiff
path: root/src/ui/tabpopup.c
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-10-25 12:35:42 +0200
committerinfirit <[email protected]>2014-10-25 12:35:42 +0200
commit20615934a9d4faf8cd45de56c51357d985461267 (patch)
treeadbb76e5fb32a72f51b0e4a6163c52b6a3d140b7 /src/ui/tabpopup.c
parent4134fe7aaf52512403e5a1319ed61fab0ce288d8 (diff)
downloadmarco-20615934a9d4faf8cd45de56c51357d985461267.tar.bz2
marco-20615934a9d4faf8cd45de56c51357d985461267.tar.xz
Cleanup GTK_CHECK_VERSION and unify where possible
gdk_x11_window_lookup_for_display since 2.24 GDK_WINDOW_XID since always gtk_widget_get_visible since 2.18 gtk_widget_set_mapped since 2.20 gdk_event_new since 2.2 gdk_x11_window_lookup_for_display since 2.24 gdk_text_property_to_utf8_list_for_display since 2.2 gtk_widget_get_realized since 2.20 gdk_visual_get_depth since 2.22 gtk_widget_get_window since 2.14 gtk_widget_set_allocation since 2.18
Diffstat (limited to 'src/ui/tabpopup.c')
-rw-r--r--src/ui/tabpopup.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/ui/tabpopup.c b/src/ui/tabpopup.c
index fe3f6b9f..934874e8 100644
--- a/src/ui/tabpopup.c
+++ b/src/ui/tabpopup.c
@@ -37,7 +37,6 @@
#include <math.h>
#if GTK_CHECK_VERSION(3, 0, 0)
- #define GTK_WIDGET_VISIBLE gtk_widget_get_visible
#define GdkRegion cairo_region_t
#define gdk_region_subtract cairo_region_subtract
#define gdk_region_destroy cairo_region_destroy
@@ -450,7 +449,7 @@ meta_ui_tab_popup_set_showing (MetaTabPopup *popup,
}
else
{
- if (GTK_WIDGET_VISIBLE (popup->window))
+ if (gtk_widget_get_visible (popup->window))
{
meta_verbose ("Hiding tab popup window\n");
gtk_widget_hide (popup->window);
@@ -524,11 +523,7 @@ display_entry (MetaTabPopup *popup,
* we manually set the window as mapped and then manually map it
* with gdk functions.
*/
- #if GTK_CHECK_VERSION(3, 0, 0)
gtk_widget_set_mapped (popup->outline_window, TRUE);
- #else
- GTK_WIDGET_SET_FLAGS (popup->outline_window, GTK_MAPPED);
- #endif
gdk_window_show_unraised (window);
}
@@ -1157,4 +1152,4 @@ meta_select_workspace_expose_event (GtkWidget *widget,
return TRUE;
}
-#endif \ No newline at end of file
+#endif