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

chrome/browser/ui/gtk/gtk_util.cc

Index: chrome/browser/ui/gtk/gtk_util.cc
diff --git a/chrome/browser/ui/gtk/gtk_util.cc b/chrome/browser/ui/gtk/gtk_util.cc
index ff9604bf9dfeb0ae8cec5a000d0f7c6b29525c8a..8bdfa041d2f1de2161aa6feb9c398adb0d0c2a60 100644
--- a/chrome/browser/ui/gtk/gtk_util.cc
+++ b/chrome/browser/ui/gtk/gtk_util.cc
@@ -80,7 +80,7 @@ gboolean OnMouseButtonPressed(GtkWidget* widget, GdkEventButton* event,
                               gpointer userdata) {
   if (event->type == GDK_BUTTON_PRESS) {
     if (gtk_button_get_focus_on_click(GTK_BUTTON(widget)) &&
-        !GTK_WIDGET_HAS_FOCUS(widget)) {
+        !gtk_widget_has_focus(widget)) {
       gtk_widget_grab_focus(widget);
     }
 
@@ -933,7 +933,7 @@ WindowOpenDisposition DispositionForCurrentButtonPressEvent() {
 bool GrabAllInput(GtkWidget* widget) {
   guint time = gtk_get_current_event_time();
 
-  if (!GTK_WIDGET_VISIBLE(widget))
+  if (!gtk_widget_get_visible(widget))
     return false;
 
   if (!gdk_pointer_grab(widget->window, TRUE,
@@ -1187,7 +1187,7 @@ string16 GetStockPreferencesMenuLabel() {
 
 bool IsWidgetAncestryVisible(GtkWidget* widget) {
   GtkWidget* parent = widget;
-  while (parent && GTK_WIDGET_VISIBLE(parent))
+  while (parent && gtk_widget_get_visible(parent))
     parent = parent->parent;
   return !parent;
 }