diff options
| author | monsta <[email protected]> | 2016-11-21 21:14:26 +0300 |
|---|---|---|
| committer | monsta <[email protected]> | 2016-11-21 21:14:26 +0300 |
| commit | d0ddaedffa7d417a699cafce73c1e418515c4a28 (patch) | |
| tree | 645b7a86e32b21113e1ce14f563bfb8d8900fa53 /mate-panel/applet.c | |
| parent | 7dfeb78328039cf92a9f45d64c9b3662d967a1fe (diff) | |
| download | mate-panel-d0ddaedffa7d417a699cafce73c1e418515c4a28.tar.bz2 mate-panel-d0ddaedffa7d417a699cafce73c1e418515c4a28.tar.xz | |
move to GTK+3 (>= 3.14), drop GTK+2 code and --with-gtk build option
and require libmate-desktop >= 1.17
WARNING: use GTK+3 build of libmateweather for this build.
that lib is not migrated to GTK+3 only as we will possibly
use libgweather instead of it.
Diffstat (limited to 'mate-panel/applet.c')
| -rw-r--r-- | mate-panel/applet.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/mate-panel/applet.c b/mate-panel/applet.c index c8b1c95b..51f64086 100644 --- a/mate-panel/applet.c +++ b/mate-panel/applet.c @@ -565,7 +565,6 @@ mate_panel_applet_create_menu (AppletInfo *info) } /* Set up theme and transparency support */ -#if GTK_CHECK_VERSION (3, 0, 0) GtkWidget *toplevel = gtk_widget_get_toplevel (menu); /* Fix any failures of compiz/other wm's to communicate with gtk for transparency */ GdkScreen *screen = gtk_widget_get_screen(GTK_WIDGET(toplevel)); @@ -576,7 +575,7 @@ mate_panel_applet_create_menu (AppletInfo *info) context = gtk_widget_get_style_context (GTK_WIDGET(toplevel)); gtk_style_context_add_class(context,"gnome-panel-menu-bar"); gtk_style_context_add_class(context,"mate-panel-menu-bar"); -#endif + return menu; } @@ -612,9 +611,7 @@ mate_panel_applet_position_menu (GtkMenu *menu, { GtkAllocation allocation; GtkRequisition requisition; -#if GTK_CHECK_VERSION(3, 0, 0) GdkDevice *device; -#endif GdkScreen *screen; GtkWidget *parent; int menu_x = 0; @@ -628,21 +625,15 @@ mate_panel_applet_position_menu (GtkMenu *menu, screen = gtk_widget_get_screen (applet); -#if GTK_CHECK_VERSION (3, 0, 0) gtk_widget_get_preferred_size (GTK_WIDGET (menu), &requisition, NULL); -#else - gtk_widget_size_request (GTK_WIDGET (menu), &requisition); -#endif gdk_window_get_origin (gtk_widget_get_window (applet), &menu_x, &menu_y); #if GTK_CHECK_VERSION(3, 20, 0) device = gdk_seat_get_pointer (gdk_display_get_default_seat (gtk_widget_get_display (applet))); gdk_window_get_device_position (gtk_widget_get_window (applet), device, &pointer_x, &pointer_y, NULL); -#elif GTK_CHECK_VERSION (3, 0, 0) +#else device = gdk_device_manager_get_client_pointer (gdk_display_get_device_manager (gtk_widget_get_display (applet))); gdk_window_get_device_position (gtk_widget_get_window (applet), device, &pointer_x, &pointer_y, NULL); -#else - gtk_widget_get_pointer (applet, &pointer_x, &pointer_y); #endif gtk_widget_get_allocation (applet, &allocation); @@ -685,11 +676,7 @@ mate_panel_applet_position_menu (GtkMenu *menu, *x = menu_x; *y = menu_y; -#if GTK_CHECK_VERSION (3, 0, 0) *push_in = FALSE; -#else - *push_in = TRUE; -#endif } static void |