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 /chrome/browser/ui/gtk/hover_controller_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 'chrome/browser/ui/gtk/hover_controller_gtk.cc')
-rw-r--r-- | chrome/browser/ui/gtk/hover_controller_gtk.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/ui/gtk/hover_controller_gtk.cc b/chrome/browser/ui/gtk/hover_controller_gtk.cc index f110ad8..d58a05a 100644 --- a/chrome/browser/ui/gtk/hover_controller_gtk.cc +++ b/chrome/browser/ui/gtk/hover_controller_gtk.cc @@ -6,6 +6,7 @@ #include "base/message_loop.h" #include "chrome/browser/ui/gtk/gtk_chrome_button.h" +#include "ui/base/gtk/gtk_compat.h" static const gchar* kHoverControllerGtkKey = "__HOVER_CONTROLLER_GTK__"; @@ -114,7 +115,7 @@ void HoverControllerGtk::OnHierarchyChanged(GtkWidget* widget, GtkWidget* previous_toplevel) { // GTK+ does not emit leave-notify-event signals when a widget // becomes unanchored, so manually unset the hover states. - if (!GTK_WIDGET_TOPLEVEL(gtk_widget_get_toplevel(widget))) { + if (!gtk_widget_is_toplevel(gtk_widget_get_toplevel(widget))) { gtk_widget_set_state(button_, GTK_STATE_NORMAL); hover_animation_.Reset(); gtk_chrome_button_set_hover_state(GTK_CHROME_BUTTON(button_), 0.0); |