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

chrome/browser/ui/gtk/gtk_chrome_button.cc

Index: chrome/browser/ui/gtk/gtk_chrome_button.cc
===================================================================
--- chrome/browser/ui/gtk/gtk_chrome_button.cc	(revision 91773)
+++ chrome/browser/ui/gtk/gtk_chrome_button.cc	(working copy)
@@ -85,14 +85,14 @@
   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
Property changes on: chrome/browser/ui/gtk/gtk_chrome_button.cc
___________________________________________________________________
Added: svn:mergeinfo