From 8f66cf42865501ce9d2894cbdcf4eb4d65e41b9c Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Fri, 31 Mar 2017 14:01:42 +0200 Subject: [PATCH] Gtk3: Replace obsolete functions gtk_statusbar_set_has_resize_grip gdk_drawable_get_screen gdk_device_get_core_pointer There is no replacement for it in gtk3 and it's probably not needed any more either. --- src/gnome-utils/gnc-embedded-window.c | 1 - src/gnome-utils/gnc-main-window.c | 1 - src/gnome/window-reconcile.c | 1 - src/gnome/window-reconcile2.c | 1 - src/import-export/csv-imp/gnc-csv-gnumeric-popup.c | 2 +- src/register/register-gnome/gnucash-sheet.c | 6 ++++-- 6 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/gnome-utils/gnc-embedded-window.c b/src/gnome-utils/gnc-embedded-window.c index c066e42b05..82598de6df 100644 --- a/src/gnome-utils/gnc-embedded-window.c +++ b/src/gnome-utils/gnc-embedded-window.c @@ -329,7 +329,6 @@ gnc_embedded_window_setup_window (GncEmbeddedWindow *window) gtk_box_pack_start (GTK_BOX (window), priv->menu_dock, FALSE, TRUE, 0); priv->statusbar = gtk_statusbar_new (); - gtk_statusbar_set_has_resize_grip (GTK_STATUSBAR(priv->statusbar), FALSE); gtk_widget_show (priv->statusbar); gtk_box_pack_end (GTK_BOX (window), priv->statusbar, FALSE, TRUE, 0); diff --git a/src/gnome-utils/gnc-main-window.c b/src/gnome-utils/gnc-main-window.c index 7a198c9c3e..21318fef7c 100644 --- a/src/gnome-utils/gnc-main-window.c +++ b/src/gnome-utils/gnc-main-window.c @@ -3535,7 +3535,6 @@ gnc_main_window_setup_window (GncMainWindow *window) gtk_widget_show (priv->statusbar); gtk_box_pack_start (GTK_BOX (main_vbox), priv->statusbar, FALSE, TRUE, 0); - gtk_statusbar_set_has_resize_grip( GTK_STATUSBAR(priv->statusbar), TRUE ); priv->progressbar = gtk_progress_bar_new (); gtk_progress_bar_set_text(GTK_PROGRESS_BAR(priv->progressbar), " "); diff --git a/src/gnome/window-reconcile.c b/src/gnome/window-reconcile.c index 88862a8396..991f417acc 100644 --- a/src/gnome/window-reconcile.c +++ b/src/gnome/window-reconcile.c @@ -1769,7 +1769,6 @@ recnWindowWithBalance (GtkWidget *parent, Account *account, G_CALLBACK(gnc_reconcile_window_popup_menu_cb), recnData); statusbar = gtk_statusbar_new(); - gtk_statusbar_set_has_resize_grip(GTK_STATUSBAR(statusbar), TRUE); gtk_box_pack_end(GTK_BOX(vbox), statusbar, FALSE, FALSE, 0); g_signal_connect (recnData->window, "destroy", diff --git a/src/gnome/window-reconcile2.c b/src/gnome/window-reconcile2.c index 80ed4f0311..783aac6237 100644 --- a/src/gnome/window-reconcile2.c +++ b/src/gnome/window-reconcile2.c @@ -1729,7 +1729,6 @@ recnWindow2WithBalance (GtkWidget *parent, Account *account, G_CALLBACK (gnc_reconcile_window_popup_menu_cb), recnData); statusbar = gtk_statusbar_new (); - gtk_statusbar_set_has_resize_grip (GTK_STATUSBAR (statusbar), TRUE); gtk_box_pack_end (GTK_BOX (vbox), statusbar, FALSE, FALSE, 0); g_signal_connect (recnData->window, "destroy", diff --git a/src/import-export/csv-imp/gnc-csv-gnumeric-popup.c b/src/import-export/csv-imp/gnc-csv-gnumeric-popup.c index 4d5b770db4..933c20380c 100644 --- a/src/import-export/csv-imp/gnc-csv-gnumeric-popup.c +++ b/src/import-export/csv-imp/gnc-csv-gnumeric-popup.c @@ -197,7 +197,7 @@ gnumeric_popup_menu (GtkMenu *menu, GdkEventButton *event) if (event) gtk_menu_set_screen (menu, - gdk_drawable_get_screen (event->window)); + gdk_window_get_screen (event->window)); g_signal_connect (G_OBJECT (menu), "hide", diff --git a/src/register/register-gnome/gnucash-sheet.c b/src/register/register-gnome/gnucash-sheet.c index 43d9620bf1..5d42fee7d3 100644 --- a/src/register/register-gnome/gnucash-sheet.c +++ b/src/register/register-gnome/gnucash-sheet.c @@ -1051,9 +1051,9 @@ gnucash_sheet_draw (GtkWidget *widget, cairo_t *cr) { GnucashSheet *sheet = GNUCASH_SHEET (widget); GtkAllocation alloc; - gtk_widget_get_allocation(widget, &alloc); gboolean result; + gtk_widget_get_allocation(widget, &alloc); cairo_save (cr); result = gnucash_sheet_draw_internal (sheet, cr, &alloc); gnucash_sheet_draw_cursor (sheet->cursor, cr); @@ -1275,11 +1275,13 @@ gnucash_sheet_check_grab (GnucashSheet *sheet) { GdkModifierType mods; GdkDevice *device; + GdkDeviceManager *device_manager; if (!sheet->grabbed) return; - device = gdk_device_get_core_pointer (); + device_manager = gdk_display_get_device_manager(gdk_display_get_default()); + device = gdk_device_manager_get_client_pointer (device_manager); gdk_device_get_state (device, gtk_widget_get_window (GTK_WIDGET(sheet)), 0, &mods);