Revert 91761 - GTK: More 2.18 goodness. Move from macros to real accessor functions.

chrome/browser/ui/gtk/custom_button.cc

Index: chrome/browser/ui/gtk/custom_button.cc
===================================================================
--- chrome/browser/ui/gtk/custom_button.cc	(revision 91772)
+++ chrome/browser/ui/gtk/custom_button.cc	(working copy)
@@ -71,7 +71,7 @@
                                         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 @@
 
 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());