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

chrome/browser/ui/gtk/gtk_custom_menu_item.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_custom_menu_item.h"
 
 #include "base/i18n/rtl.h"
 #include "chrome/browser/ui/gtk/gtk_custom_menu.h"
 
 // This method was autogenerated by the program glib-genmarshall, which
@@ skipping 153 matching lines @@
 static void gtk_custom_menu_item_finalize(GObject *object) {
   GtkCustomMenuItem* item = GTK_CUSTOM_MENU_ITEM(object);
   g_list_free(item->all_widgets);
   g_list_free(item->button_widgets);
 
   G_OBJECT_CLASS(gtk_custom_menu_item_parent_class)->finalize(object);
 }
 
 static gint gtk_custom_menu_item_expose(GtkWidget* widget,
                                         GdkEventExpose* event) {
-  if (GTK_WIDGET_VISIBLE(widget) &&
+  if (gtk_widget_get_visible(widget) &&
       GTK_WIDGET_MAPPED(widget) &&
       gtk_bin_get_child(GTK_BIN(widget))) {
     // We skip the drawing in the GtkMenuItem class it draws the highlighted
     // background and we don't want that.
     gtk_container_propagate_expose(GTK_CONTAINER(widget),
                                    gtk_bin_get_child(GTK_BIN(widget)),
                                    event);
   }
 
   return FALSE;
@@ skipping 20 matching lines @@
   if (base::i18n::IsRTL())
     std::swap(first_button, last_button);
 
   int x = first_button->allocation.x;
   int y = first_button->allocation.y;
   int width = last_button->allocation.width + last_button->allocation.x -
               first_button->allocation.x;
   int height = last_button->allocation.height;
 
   gtk_paint_box(hbox->style, hbox->window,
-                static_cast<GtkStateType>(
-                    GTK_WIDGET_STATE(current_button)),
+                gtk_widget_get_state(current_button),
                 GTK_SHADOW_OUT,
                 &current_button->allocation, hbox, "button",
                 x, y, width, height);
 
   // Propagate to the button's children.
   gtk_container_propagate_expose(
       GTK_CONTAINER(current_button),
       gtk_bin_get_child(GTK_BIN(current_button)),
       event);
 }
@@ skipping 19 matching lines @@
        current_item != NULL; current_item = g_list_next(current_item)) {
     if (GTK_IS_BUTTON(current_item->data)) {
       // Check to see if this is the last button in a run.
       GList* next_item = g_list_next(current_item);
       if (next_item && GTK_IS_BUTTON(next_item->data)) {
         GtkWidget* current_button = GTK_WIDGET(current_item->data);
         GtkAllocation child_alloc =
             gtk_bin_get_child(GTK_BIN(current_button))->allocation;
         int half_offset = widget->style->xthickness / 2;
         gtk_paint_vline(widget->style, widget->window,
-                        static_cast<GtkStateType>(
-                            GTK_WIDGET_STATE(current_button)),
+                        gtk_widget_get_state(current_button),
                         &event->area, widget, "button",
                         child_alloc.y,
                         child_alloc.y + child_alloc.height,
                         current_button->allocation.x +
                         current_button->allocation.width - half_offset);
       }
     }
   }
 
   // Finally, draw the selected item on top of the separators so there are no
@@ skipping 203 matching lines @@
                                          gpointer callback_data) {
   // Even though we're filtering |all_widgets| on GTK_IS_BUTTON(), this isn't
   // equivalent to |button_widgets| because we also want the button-labels.
   for (GList* i = menu_item->all_widgets; i && GTK_IS_BUTTON(i->data);
        i = g_list_next(i)) {
     if (GTK_IS_BUTTON(i->data)) {
       callback(GTK_WIDGET(i->data), callback_data);
     }
   }
 }