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/browser_toolbar_gtk.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/browser_toolbar_gtk.cc')
| -rw-r--r-- | chrome/browser/ui/gtk/browser_toolbar_gtk.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/ui/gtk/browser_toolbar_gtk.cc b/chrome/browser/ui/gtk/browser_toolbar_gtk.cc index b8389a0..71fadf1 100644 --- a/chrome/browser/ui/gtk/browser_toolbar_gtk.cc +++ b/chrome/browser/ui/gtk/browser_toolbar_gtk.cc @@ -211,7 +211,7 @@ void BrowserToolbarGtk::Init(Profile* profile, l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)).c_str()); g_signal_connect(wrench_button, "button-press-event", G_CALLBACK(OnMenuButtonPressEventThunk), this); - gtk_widget_set_can_focus(wrench_button, FALSE); + GTK_WIDGET_UNSET_FLAGS(wrench_button, GTK_CAN_FOCUS); // Put the wrench button in a box so that we can paint the update notification // over it. @@ -301,7 +301,7 @@ void BrowserToolbarGtk::EnabledStateChangedForCommand(int id, bool enabled) { break; } if (widget) { - if (!enabled && gtk_widget_get_state(widget) == GTK_STATE_PRELIGHT) { + if (!enabled && GTK_WIDGET_STATE(widget) == GTK_STATE_PRELIGHT) { // If we're disabling a widget, GTK will helpfully restore it to its // previous state when we re-enable it, even if that previous state // is the prelight. This looks bad. See the bug for a simple repro. |