[gtk+/gtk-3-22] Some forgotten deprecation cleanup



commit b109d25e8ba1ff56160654fe9ac713ae01ba3c31
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Oct 20 13:58:49 2016 -0400

    Some forgotten deprecation cleanup

 gtk/gtkwindow.c                 |    2 ++
 modules/input/gtkimcontextxim.c |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 1a4b14b..873acf1 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -11446,6 +11446,7 @@ gtk_window_parse_geometry (GtkWindow   *window,
   if ((result & YValue) == 0)
     y = 0;
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   if (grav == GDK_GRAVITY_SOUTH_WEST ||
       grav == GDK_GRAVITY_SOUTH_EAST)
     y = gdk_screen_get_height (screen) - h + y;
@@ -11453,6 +11454,7 @@ gtk_window_parse_geometry (GtkWindow   *window,
   if (grav == GDK_GRAVITY_SOUTH_EAST ||
       grav == GDK_GRAVITY_NORTH_EAST)
     x = gdk_screen_get_width (screen) - w + x;
+G_GNUC_END_IGNORE_DEPRECATIONS
 
   /* we don't let you put a window offscreen; maybe some people would
    * prefer to be able to, but it's kind of a bogus thing to do.
diff --git a/modules/input/gtkimcontextxim.c b/modules/input/gtkimcontextxim.c
index 9a152b5..3f17418 100644
--- a/modules/input/gtkimcontextxim.c
+++ b/modules/input/gtkimcontextxim.c
@@ -1624,7 +1624,9 @@ on_status_toplevel_configure (GtkWidget         *toplevel,
 
   if (status_window->window)
     {
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
       height = gdk_screen_get_height (gtk_widget_get_screen (toplevel));
+G_GNUC_END_IGNORE_DEPRECATIONS
 
       gdk_window_get_frame_extents (gtk_widget_get_window (toplevel),
                                     &rect);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]