chrome/browser/ui/gtk/browser_toolbar_gtk.cc - Issue 7329003: Revert 91761 - GTK: More 2.18 goodness. Move from macros to real accessor functions.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/gtk/browser_toolbar_gtk.cc

Issue 7329003: Revert 91761 - GTK: More 2.18 goodness. Move from macros to real accessor functions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: chrome/browser/ui/gtk/browser_toolbar_gtk.cc

===================================================================

--- chrome/browser/ui/gtk/browser_toolbar_gtk.cc (revision 91772)

+++ chrome/browser/ui/gtk/browser_toolbar_gtk.cc (working copy)

@@ -211,7 +211,7 @@

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 @@

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.

« no previous file with comments | « chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc ('k') | chrome/browser/ui/gtk/browser_window_gtk.cc » ('j') | no next file with comments »