[med-svn] [aghermann] 19/23: sweep up deprecated gtk_ and gdk_ functions

[andrei zavada]

This is an automated email from the git hooks/post-receive script.

hmmr-guest pushed a commit to tag 1.1.2
in repository aghermann.

commit b9c361d23ebe7f96918821e620c40d7f0e636e65
Author: Andrei Zavada <hmmr at frdg>
Date:   Tue Jan 3 14:16:43 2017 +0200

    sweep up deprecated gtk_ and gdk_ functions
---
 upstream/src/aghermann/ui/globals.cc          |  4 ++--
 upstream/src/aghermann/ui/mf/mf.cc            |  5 +----
 upstream/src/aghermann/ui/sf/d/patterns_cb.cc |  4 +---
 upstream/src/aghermann/ui/sf/montage_cb.cc    | 17 +++++------------
 4 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/upstream/src/aghermann/ui/globals.cc b/upstream/src/aghermann/ui/globals.cc
index abd0aae..3e3cd22 100644
--- a/upstream/src/aghermann/ui/globals.cc
+++ b/upstream/src/aghermann/ui/globals.cc
@@ -40,8 +40,8 @@ prepare_for_expdesign()
 {
       // tell me what they are
         client_pointer =
-                gdk_device_manager_get_client_pointer(
-                        gdk_display_get_device_manager( gdk_display_get_default()));
+                gdk_seat_get_pointer(
+                        gdk_display_get_default_seat( gdk_display_get_default()));
 
         GResource
                 *gresource
diff --git a/upstream/src/aghermann/ui/mf/mf.cc b/upstream/src/aghermann/ui/mf/mf.cc
index 0db8769..6d8e6bd 100644
--- a/upstream/src/aghermann/ui/mf/mf.cc
+++ b/upstream/src/aghermann/ui/mf/mf.cc
@@ -68,10 +68,7 @@ SModelrunFacility (agh::ach::CModelRun& csim, SExpDesignUI& parent)
                         "Simulation: %s (%s) in %s (%s)",
                         csim.subject(), csim.session(), csim.channel(),
                         csim.P().display_name().c_str()));
-        gtk_window_set_default_size(
-                wModelrunFacility,
-                gdk_screen_get_width( gdk_screen_get_default()) * .80,
-                gdk_screen_get_height( gdk_screen_get_default()) * .55);
+        set_window_size_as_screen_fraction( wModelrunFacility, .80, .55);
 
         gtk_toggle_button_set_active( (GtkToggleButton*)eMFDB1, csim.ctl_params.DBAmendment1);
         gtk_toggle_button_set_active( (GtkToggleButton*)eMFDB2, csim.ctl_params.DBAmendment2);
diff --git a/upstream/src/aghermann/ui/sf/d/patterns_cb.cc b/upstream/src/aghermann/ui/sf/d/patterns_cb.cc
index 03eabf9..75bf37e 100644
--- a/upstream/src/aghermann/ui/sf/d/patterns_cb.cc
+++ b/upstream/src/aghermann/ui/sf/d/patterns_cb.cc
@@ -128,9 +128,7 @@ daSFFDField_button_press_event_cb(
             break;
         case 3:
                 FD.update_field_check_menu_items();
-                gtk_menu_popup(
-                        FD.iiSFFDField,
-                        NULL, NULL, NULL, NULL, 3, event->time);
+                gtk_menu_popup_at_pointer( FD.iiSFFDField, (GdkEvent*)event);
             break;
         }
 
diff --git a/upstream/src/aghermann/ui/sf/montage_cb.cc b/upstream/src/aghermann/ui/sf/montage_cb.cc
index 68b071a..b46d608 100644
--- a/upstream/src/aghermann/ui/sf/montage_cb.cc
+++ b/upstream/src/aghermann/ui/sf/montage_cb.cc
@@ -99,8 +99,7 @@ daSFMontage_button_press_event_cb(
                                 (GtkContainer*)SF.iiSFICAPage,
                                 radio_item_setter, (gpointer)mapped);
                         SF.suppress_redraw = false;
-                        gtk_menu_popup( SF.iiSFICAPage,
-                                        NULL, NULL, NULL, NULL, 3, event->time);
+                        gtk_menu_popup_at_pointer( SF.iiSFICAPage, (GdkEvent*)event);
                 }
                 return TRUE;
         }
@@ -141,9 +140,7 @@ daSFMontage_button_press_event_cb(
                     break;
                 case 3:
                         Ch->update_power_menu_items();
-                        gtk_menu_popup(
-                                SF.iiSFPower,
-                                NULL, NULL, NULL, NULL, 3, event->time);
+                        gtk_menu_popup_at_pointer( SF.iiSFPower, (GdkEvent*)event);
                     break;
                 }
 
@@ -181,14 +178,11 @@ daSFMontage_button_press_event_cb(
                 case 3:
                         if ( (event->state & GDK_MOD1_MASK && SF.n_hidden > 0) ||
                              !(SF.n_hidden < (int)SF.channels.size()) )
-                                gtk_menu_popup( SF.iiSFPageHidden,
-                                                NULL, NULL, NULL, NULL, 3, event->time);
+                                gtk_menu_popup_at_pointer( SF.iiSFPageHidden, (GdkEvent*)event);
                         else {
                                 Ch->update_channel_menu_items( event->x);
                                 Ch->update_power_menu_items();
-                                gtk_menu_popup(
-                                        in_selection ? SF.iiSFPageSelection : SF.iiSFPage,
-                                        NULL, NULL, NULL, NULL, 3, event->time);
+                                gtk_menu_popup_at_pointer( in_selection ? SF.iiSFPageSelection : SF.iiSFPage, (GdkEvent*)event);
                         }
                     break;
 
@@ -362,8 +356,7 @@ daSFMontage_button_release_event_cb(
                         Ch->selectively_enable_selection_menu_items();
                         Ch->update_channel_menu_items( event->x);
                         if ( fabs(SF.using_channel->marquee_mstart - SF.using_channel->marquee_mend) > 5 ) {
-                                gtk_menu_popup( SF.iiSFPageSelection,
-                                                NULL, NULL, NULL, NULL, 3, event->time);
+                                gtk_menu_popup_at_pointer( SF.iiSFPageSelection, (GdkEvent*)event);
                         }
                         gtk_widget_queue_draw( wid);
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/aghermann.git