diff options
| author | Sorokin Alexei <[email protected]> | 2016-06-16 18:09:25 +0300 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2016-06-29 18:42:12 +0200 |
| commit | 225702b3c6a609065465c66f0f2739fc1d2184a9 (patch) | |
| tree | 08c677b952074a8a79b93c9d895950bdbd85799d /mate-panel/panel-toplevel.c | |
| parent | de1be3467a6ff1b350fc286025364650c8d51d1e (diff) | |
| download | mate-panel-225702b3c6a609065465c66f0f2739fc1d2184a9.tar.bz2 mate-panel-225702b3c6a609065465c66f0f2739fc1d2184a9.tar.xz | |
fix some warnings and deprecations
Diffstat (limited to 'mate-panel/panel-toplevel.c')
| -rw-r--r-- | mate-panel/panel-toplevel.c | 47 |
1 files changed, 35 insertions, 12 deletions
diff --git a/mate-panel/panel-toplevel.c b/mate-panel/panel-toplevel.c index 084d0684..749e04df 100644 --- a/mate-panel/panel-toplevel.c +++ b/mate-panel/panel-toplevel.c @@ -442,8 +442,12 @@ static void panel_toplevel_begin_grab_op(PanelToplevel* toplevel, PanelGrabOpTyp GdkDisplay *display; GdkDevice *pointer; GdkDevice *keyboard; +#if GTK_CHECK_VERSION (3, 0, 0) + GdkSeat *seat; +#else GdkDeviceManager *device_manager; #endif +#endif if (toplevel->priv->state != PANEL_STATE_NORMAL || toplevel->priv->grab_op != PANEL_GRAB_OP_NONE) @@ -501,8 +505,13 @@ static void panel_toplevel_begin_grab_op(PanelToplevel* toplevel, PanelGrabOpTyp cursor_type); #if GTK_CHECK_VERSION (3, 0, 0) display = gdk_window_get_display (window); +#if GTK_CHECK_VERSION(3, 20, 0) + seat = gdk_display_get_default_seat (display); + pointer = gdk_seat_get_pointer (seat); +#else device_manager = gdk_display_get_device_manager (display); pointer = gdk_device_manager_get_client_pointer (device_manager); +#endif keyboard = gdk_device_get_associated_device (pointer); gdk_device_grab (pointer, window, @@ -537,8 +546,12 @@ static void panel_toplevel_end_grab_op (PanelToplevel* toplevel, guint32 time_) GdkDisplay *display; GdkDevice *pointer; GdkDevice *keyboard; +#if GTK_CHECK_VERSION (3, 0, 0) + GdkSeat *seat; +#else GdkDeviceManager *device_manager; #endif +#endif g_return_if_fail (toplevel->priv->grab_op != PANEL_GRAB_OP_NONE); @@ -551,8 +564,13 @@ static void panel_toplevel_end_grab_op (PanelToplevel* toplevel, guint32 time_) #if GTK_CHECK_VERSION (3, 0, 0) display = gtk_widget_get_display (widget); +#if GTK_CHECK_VERSION(3, 20, 0) + seat = gdk_display_get_default_seat (display); + pointer = gdk_seat_get_pointer (seat); +#else device_manager = gdk_display_get_device_manager (display); pointer = gdk_device_manager_get_client_pointer (device_manager); +#endif keyboard = gdk_device_get_associated_device (pointer); gdk_device_ungrab (pointer, time_); @@ -866,10 +884,12 @@ static gboolean panel_toplevel_warp_pointer_increment(PanelToplevel* toplevel, i screen = gtk_window_get_screen (GTK_WINDOW (toplevel)); root_window = gdk_screen_get_root_window (screen); - -#if GTK_CHECK_VERSION (3, 0, 0) +#if GTK_CHECK_VERSION(3, 20, 0) + device = gdk_seat_get_pointer (gdk_display_get_default_seat (gtk_widget_get_display (GTK_WIDGET(root_window)))); + gdk_window_get_device_position (gtk_widget_get_window (GTK_WIDGET (root_window)), device, &new_x, &new_y, NULL); +#elif GTK_CHECK_VERSION (3, 0, 0) device = gdk_device_manager_get_client_pointer (gdk_display_get_device_manager (gtk_widget_get_display (GTK_WIDGET(root_window)))); - gdk_window_get_device_position(gtk_widget_get_window (GTK_WIDGET(root_window)), device, &new_x, &new_y, NULL); + gdk_window_get_device_position (gtk_widget_get_window (GTK_WIDGET (root_window)), device, &new_x, &new_y, NULL); #else gdk_window_get_pointer (root_window, &new_x, &new_y, NULL); #endif @@ -1377,14 +1397,20 @@ static gboolean panel_toplevel_contains_pointer(PanelToplevel* toplevel) GdkDisplay *display; GdkScreen *screen; GtkWidget *widget; -#if GTK_CHECK_VERSION (3, 0, 0) +#if GTK_CHECK_VERSION(3, 20, 0) + GdkSeat *seat; + GdkDevice *pointer; +#elif GTK_CHECK_VERSION (3, 0, 0) GdkDeviceManager *device_manager; GdkDevice *pointer; #endif int x, y; display = gdk_display_get_default (); -#if GTK_CHECK_VERSION (3, 0, 0) +#if GTK_CHECK_VERSION(3, 20, 0) + seat = gdk_display_get_default_seat (display); + pointer = gdk_seat_get_pointer (seat); +#elif GTK_CHECK_VERSION (3, 0, 0) device_manager = gdk_display_get_device_manager (display); pointer = gdk_device_manager_get_client_pointer (device_manager); #endif @@ -1569,9 +1595,7 @@ void panel_toplevel_update_edges(PanelToplevel* toplevel) height = toplevel->priv->geometry.height; edges = PANEL_EDGE_NONE; -#if GTK_CHECK_VERSION (3, 18, 0) - background = &toplevel->background; -#else +#if !GTK_CHECK_VERSION (3, 0, 0) background = &toplevel->priv->panel_widget->background; #endif @@ -3137,7 +3161,6 @@ panel_toplevel_realize (GtkWidget *widget) GdkScreen *screen; GdkVisual *visual; GdkWindow *window; - GdkGeometry geometry; toplevel = PANEL_TOPLEVEL (widget); @@ -3529,7 +3552,7 @@ static gboolean panel_toplevel_expose(GtkWidget* widget, GdkEventExpose* event) #if GTK_CHECK_VERSION (3, 0, 0) x = 0; y = 0; - height = height; + height = aheight; #else int xthickness, ythickness; x = allocation.x; @@ -3759,7 +3782,7 @@ panel_toplevel_button_release_event (GtkWidget *widget, return TRUE; } #if GTK_CHECK_VERSION (3, 18, 0) -static void +static gboolean panel_toplevel_configure_event (GtkWidget *widget, GdkEventConfigure *event) { @@ -3769,7 +3792,7 @@ panel_toplevel_configure_event (GtkWidget *widget, set_background_region (toplevel); - return; + return TRUE; } #endif |