diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2011-07-24 19:39:21 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2011-07-24 19:39:21 +0000 |
| commit | 324477b59f0d5850e27728f622452e2c7cef69f1 (patch) | |
| tree | 573bffcabc14b56971e5e327c61d9af75cdd93dc | |
| parent | 5552e61f6cc343be84f6244ace9e3a2436c88c61 (diff) | |
| download | wireshark-324477b59f0d5850e27728f622452e2c7cef69f1.tar.gz wireshark-324477b59f0d5850e27728f622452e2c7cef69f1.tar.bz2 wireshark-324477b59f0d5850e27728f622452e2c7cef69f1.zip | |
Replace deprecated functions.
svn path=/trunk/; revision=38188
| -rw-r--r-- | gtk/gui_utils.c | 17 | ||||
| -rw-r--r-- | gtk/main.c | 4 | ||||
| -rw-r--r-- | gtk/old-gtk-compat.h | 1 |
3 files changed, 8 insertions, 14 deletions
diff --git a/gtk/gui_utils.c b/gtk/gui_utils.c index 1c36035656..ec35519503 100644 --- a/gtk/gui_utils.c +++ b/gtk/gui_utils.c @@ -308,6 +308,8 @@ window_get_geometry(GtkWidget *widget, window_geometry_t *geom) http://mail.gnome.org/archives/gtk-devel-list/2001-March/msg00289.html http://www.gtk.org/faq/#AEN606 + + As gdk_window_get_deskrelative_origin() is deprecated it has been removed 2011-07-24. */ memset (geom, 0, sizeof (window_geometry_t)); @@ -317,21 +319,16 @@ window_get_geometry(GtkWidget *widget, window_geometry_t *geom) gdk_window_get_root_origin(widget_window, &geom->x, &geom->y); - if (gdk_window_get_deskrelative_origin(widget_window, - &desk_x, &desk_y)) { - if (desk_x <= geom->x && - desk_y <= geom->y) - { - geom->x = desk_x; - geom->y = desk_y; - } - } /* XXX - Is this the "approved" method? */ +#if GTK_CHECK_VERSION(2,24,0) + geom->width = gdk_window_get_width(widget_window); + geom->height = gdk_window_get_height (widget_window); +#else gdk_drawable_get_size(widget_window, &geom->width, &geom->height); - +#endif state = gdk_window_get_state(widget_window); geom->maximized = (state == GDK_WINDOW_STATE_MAXIMIZED); } diff --git a/gtk/main.c b/gtk/main.c index ad5297eb45..3934745866 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -3439,11 +3439,7 @@ is_widget_visible(GtkWidget *widget, gpointer data) gboolean *is_visible = data; if (!*is_visible) { -#if GTK_CHECK_VERSION(2,18,0) if (gtk_widget_get_visible(widget)) -#else - if (GTK_WIDGET_VISIBLE(widget)) -#endif *is_visible = TRUE; } } diff --git a/gtk/old-gtk-compat.h b/gtk/old-gtk-compat.h index bcc5493566..4a4577c766 100644 --- a/gtk/old-gtk-compat.h +++ b/gtk/old-gtk-compat.h @@ -47,6 +47,7 @@ #endif #if !GTK_CHECK_VERSION (2, 18, 0) +# define gtk_widget_getvisible(x) GTK_WIDGET_VISIBLE(x) #endif #if !GTK_CHECK_VERSION (2, 20, 0) |