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

chrome/browser/ui/gtk/gtk_util.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_util.h"
 
 #include <cairo/cairo.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 
@@ skipping 62 matching lines @@
 void RemoveWidget(GtkWidget* widget, gpointer container) {
   gtk_container_remove(GTK_CONTAINER(container), widget);
 }
 
 // These two functions are copped almost directly from gtk core. The only
 // difference is that they accept middle clicks.
 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);
     }
 
     gint button_mask = GPOINTER_TO_INT(userdata);
     if (button_mask & (1 << event->button))
       gtk_button_pressed(GTK_BUTTON(widget));
   }
 
   return TRUE;
 }
@@ skipping 832 matching lines @@
   }
 
   guint state = event->button.state;
   gdk_event_free(event);
   return event_utils::DispositionFromEventFlags(state);
 }
 
 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,
                         GdkEventMask(GDK_BUTTON_PRESS_MASK |
                                      GDK_BUTTON_RELEASE_MASK |
                                      GDK_ENTER_NOTIFY_MASK |
                                      GDK_LEAVE_NOTIFY_MASK |
                                      GDK_POINTER_MOTION_MASK),
                         NULL, NULL, time) == 0) {
     return false;
@@ skipping 233 matching lines @@
   string16 preferences;
   if (gtk_stock_lookup(GTK_STOCK_PREFERENCES, &stock_item)) {
     const char16 kUnderscore[] = { '_', 0 };
     RemoveChars(UTF8ToUTF16(stock_item.label), kUnderscore, &preferences);
   }
   return preferences;
 }
 
 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;
 }
 
 void SetLabelWidth(GtkWidget* label, int pixel_width) {
   gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
   gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
 
   // Do the simple thing in LTR because the bug only affects right-aligned
   // text. Also, when using the workaround, the label tries to maintain
@@ skipping 80 matching lines @@
 
 void DoCopy(BrowserWindow* window) {
   DoCutCopyPaste(window, &RenderViewHost::Copy, "copy-clipboard");
 }
 
 void DoPaste(BrowserWindow* window) {
   DoCutCopyPaste(window, &RenderViewHost::Paste, "paste-clipboard");
 }
 
 }  // namespace gtk_util