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

chrome/browser/ui/gtk/browser_toolbar_gtk.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/browser_toolbar_gtk.h"
 
 #include <X11/XF86keysym.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
@@ skipping 193 matching lines @@
       IDR_TOOLS, IDR_TOOLS_P, IDR_TOOLS_H, 0,
       wrench_menu_image_));
   GtkWidget* wrench_button = wrench_menu_button_->widget();
 
   gtk_widget_set_tooltip_text(
       wrench_button,
       l10n_util::GetStringFUTF8(IDS_APPMENU_TOOLTIP,
           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.
   GtkWidget* wrench_box = gtk_alignment_new(0, 0, 1, 1);
   g_signal_connect_after(wrench_box, "expose-event",
                          G_CALLBACK(OnWrenchMenuButtonExposeThunk), this);
   gtk_container_add(GTK_CONTAINER(wrench_box), wrench_button);
   gtk_box_pack_start(GTK_BOX(toolbar_), wrench_box, FALSE, FALSE, 4);
 
   wrench_menu_.reset(new MenuGtk(this, &wrench_menu_model_));
@@ skipping 69 matching lines @@
       break;
     case IDC_FORWARD:
       widget = forward_->widget();
       break;
     case IDC_HOME:
       if (home_.get())
         widget = home_->widget();
       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.
       // http://code.google.com/p/chromium/issues/detail?id=13729
       gtk_widget_set_state(widget, GTK_STATE_NORMAL);
     }
     gtk_widget_set_sensitive(widget, enabled);
   }
 }
 
@@ skipping 332 matching lines @@
   int x_offset = base::i18n::IsRTL() ? 0 :
       sender->allocation.width - badge->width();
   int y_offset = 0;
   canvas.DrawBitmapInt(
       *badge,
       sender->allocation.x + x_offset,
       sender->allocation.y + y_offset);
 
   return FALSE;
 }