Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6092)

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

Issue 7227027: GTK: More 2.18 goodness. Move from macros to real accessor functions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove views/ 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/custom_button.cc
diff --git a/chrome/browser/ui/gtk/custom_button.cc b/chrome/browser/ui/gtk/custom_button.cc
index 9cd2d9806b63a467bff32b4a83604fea97f554b6..a46e2442f7c8df7387e34afe76de057664d490c2 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_STATE(widget);
+ paint_override_ : gtk_widget_get_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_UNSET_FLAGS(widget(), GTK_CAN_FOCUS);
+ gtk_widget_set_can_focus(widget(), FALSE);
g_signal_connect(widget(), "expose-event",
G_CALLBACK(OnCustomExposeThunk), this);
hover_controller_.Init(widget());
« no previous file with comments | « chrome/browser/ui/gtk/crypto_module_password_dialog.cc ('k') | chrome/browser/ui/gtk/download/download_item_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698