diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-07 22:30:19 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-07 22:30:19 +0000 |
| commit | 27883bbbf6b412ff4b239e0eaa32afb0773036fb (patch) | |
| tree | b16076df12a7bb0ba5b8b387b1e290572de9d345 /chrome/browser/ui/gtk/custom_button.cc | |
| parent | 722fe2fda5e19985413c9f492cf93b7fc902354e (diff) | |
| download | chromium_src-27883bbbf6b412ff4b239e0eaa32afb0773036fb.zip chromium_src-27883bbbf6b412ff4b239e0eaa32afb0773036fb.tar.gz chromium_src-27883bbbf6b412ff4b239e0eaa32afb0773036fb.tar.bz2 | |
Revert 91761 - GTK: More 2.18 goodness. Move from macros to real accessor functions.
This does not take care of everything! There are many deprecated macros that we
can't replace because their accessor replacements were in 2.20 or later.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7227027
TBR=erg@chromium.org
Review URL: http://codereview.chromium.org/7329003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91774 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/gtk/custom_button.cc')
| -rw-r--r-- | chrome/browser/ui/gtk/custom_button.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/ui/gtk/custom_button.cc b/chrome/browser/ui/gtk/custom_button.cc index a46e244..9cd2d98 100644 --- a/chrome/browser/ui/gtk/custom_button.cc +++ b/chrome/browser/ui/gtk/custom_button.cc @@ -71,7 +71,7 @@ gboolean CustomDrawButtonBase::OnExpose(GtkWidget* widget, GdkEventExpose* e, gdouble hover_state) { int paint_state = paint_override_ >= 0 ? - paint_override_ : gtk_widget_get_state(widget); + paint_override_ : GTK_WIDGET_STATE(widget); // If the paint state is PRELIGHT then set it to NORMAL (we will paint the // hover state according to |hover_state_|). @@ -273,7 +273,7 @@ CustomDrawButton::~CustomDrawButton() { void CustomDrawButton::Init() { widget_.Own(gtk_chrome_button_new()); - gtk_widget_set_can_focus(widget(), FALSE); + GTK_WIDGET_UNSET_FLAGS(widget(), GTK_CAN_FOCUS); g_signal_connect(widget(), "expose-event", G_CALLBACK(OnCustomExposeThunk), this); hover_controller_.Init(widget()); |