diff options
| author | Steve Block <steveblock@google.com> | 2010-04-27 16:31:00 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-05-11 14:42:12 +0100 |
| commit | dcc8cf2e65d1aa555cce12431a16547e66b469ee (patch) | |
| tree | 92a8d65cd5383bca9749f5327fb5e440563926e6 /WebCore/plugins/gtk/gtk2xtbin.c | |
| parent | ccac38a6b48843126402088a309597e682f40fe6 (diff) | |
| download | external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.zip external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.gz external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.bz2 | |
Merge webkit.org at r58033 : Initial merge by git
Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
Diffstat (limited to 'WebCore/plugins/gtk/gtk2xtbin.c')
| -rw-r--r-- | WebCore/plugins/gtk/gtk2xtbin.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/WebCore/plugins/gtk/gtk2xtbin.c b/WebCore/plugins/gtk/gtk2xtbin.c index 68c5373..fad66fe 100644 --- a/WebCore/plugins/gtk/gtk2xtbin.c +++ b/WebCore/plugins/gtk/gtk2xtbin.c @@ -42,6 +42,7 @@ * inside a GTK application. */ +#include "GtkVersioning.h" #include "xembed.h" #include "gtk2xtbin.h" #include <gtk/gtk.h> @@ -401,7 +402,7 @@ gtk_xtbin_set_position (GtkXtBin *xtbin, xtbin->x = x; xtbin->y = y; - if (GTK_WIDGET_REALIZED (xtbin)) + if (gtk_widget_get_realized (xtbin)) gdk_window_move (GTK_WIDGET (xtbin)->window, x, y); } @@ -456,7 +457,7 @@ gtk_xtbin_unrealize (GtkWidget *object) widget = GTK_WIDGET(object); GTK_WIDGET_UNSET_FLAGS (widget, GTK_VISIBLE); - if (GTK_WIDGET_REALIZED (widget)) { + if (gtk_widget_get_realized (widget)) { xt_client_unrealize(&(xtbin->xtclient)); } |