diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-22 01:17:31 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-22 01:17:31 +0000 |
| commit | a7e1b45acd4e99f391420981d1324afeda100889 (patch) | |
| tree | cbdb56d0885473a24c71f10ae60469219b7f7b37 /webkit/tools/test_shell/test_shell_gtk.cc | |
| parent | f5b26caccf0dae6145b0b81580c59a813fb7b835 (diff) | |
| download | chromium_src-a7e1b45acd4e99f391420981d1324afeda100889.zip chromium_src-a7e1b45acd4e99f391420981d1324afeda100889.tar.gz chromium_src-a7e1b45acd4e99f391420981d1324afeda100889.tar.bz2 | |
GTK: Create the start of a compatibility header wrapping deprecated methods.
GTK 2.24 deprecated all sorts of raw access to object internals in preparation
for GTK3.
BUG=79722
TEST=compiles
TBR=tony,jam
Review URL: http://codereview.chromium.org/8588068
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111065 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/test_shell_gtk.cc')
| -rw-r--r-- | webkit/tools/test_shell/test_shell_gtk.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/webkit/tools/test_shell/test_shell_gtk.cc b/webkit/tools/test_shell/test_shell_gtk.cc index e4a638b..c2b37b1 100644 --- a/webkit/tools/test_shell/test_shell_gtk.cc +++ b/webkit/tools/test_shell/test_shell_gtk.cc @@ -25,6 +25,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPoint.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "ui/base/gtk/gtk_compat.h" #include "ui/base/resource/resource_bundle.h" #include "webkit/glue/resource_loader_bridge.h" #include "webkit/glue/webkit_glue.h" @@ -431,7 +432,7 @@ void TestShell::InteractiveSetFocus(WebWidgetHost* host, bool enable) { gtk_widget_grab_focus(widget); } else if (gtk_widget_is_focus(widget)) { GtkWidget *toplevel = gtk_widget_get_toplevel(widget); - if (GTK_WIDGET_TOPLEVEL(toplevel)) + if (gtk_widget_is_toplevel(toplevel)) gtk_window_set_focus(GTK_WINDOW(toplevel), NULL); } } |