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

chrome/browser/ui/gtk/gtk_chrome_button.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/gtk/gtk_chrome_button.h"
 
 #include "base/basictypes.h"
 #include "chrome/browser/ui/gtk/nine_box.h"
 #include "grit/ui_resources.h"
 #include "ui/gfx/gtk_util.h"
@@ skipping 67 matching lines @@
   GObjectClass* gobject_class = G_OBJECT_CLASS(button_class);
   g_type_class_add_private(gobject_class, sizeof(GtkChromeButtonPrivate));
 }
 
 static void gtk_chrome_button_init(GtkChromeButton* button) {
   GtkChromeButtonPrivate* priv = GTK_CHROME_BUTTON_GET_PRIVATE(button);
   priv->paint_state = -1;
   priv->use_gtk_rendering = FALSE;
   priv->hover_state = -1.0;
 
-  gtk_widget_set_can_focus(GTK_WIDGET(button), FALSE);
+  GTK_WIDGET_UNSET_FLAGS(button, GTK_CAN_FOCUS);
 }
 
 static gboolean gtk_chrome_button_expose(GtkWidget* widget,
                                          GdkEventExpose* event) {
   GtkChromeButtonPrivate *priv = GTK_CHROME_BUTTON_GET_PRIVATE(widget);
   int paint_state = priv->paint_state < 0 ?
-                    gtk_widget_get_state(widget) : priv->paint_state;
+                    GTK_WIDGET_STATE(widget) : priv->paint_state;
 
   if (priv->use_gtk_rendering) {
     // We have the superclass handle this expose when we aren't using custom
     // rendering AND we're in either the prelight or active state so that we
     // get the button border for the current GTK theme drawn.
     if (paint_state == GTK_STATE_PRELIGHT || paint_state == GTK_STATE_ACTIVE) {
       // Set the state of button->depressed so we paint pressed even if the
       // actual state of the button is something else.
       GTK_BUTTON(widget)->depressed = (paint_state == GTK_STATE_ACTIVE);
       return GTK_WIDGET_CLASS(gtk_chrome_button_parent_class)->expose_event
@@ skipping 58 matching lines @@
                                        gdouble state) {
   GtkChromeButtonPrivate* priv = GTK_CHROME_BUTTON_GET_PRIVATE(button);
   if (state >= 0.0 && state <= 1.0)
     priv->hover_state = state;
   else
     priv->hover_state = -1.0;
   gtk_widget_queue_draw(GTK_WIDGET(button));
 }
 
 G_END_DECLS