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

chrome/browser/ui/gtk/gtk_custom_menu_item.cc

Index: chrome/browser/ui/gtk/gtk_custom_menu_item.cc
diff --git a/chrome/browser/ui/gtk/gtk_custom_menu_item.cc b/chrome/browser/ui/gtk/gtk_custom_menu_item.cc
index 4e54c21b138e4d43df14e654837080c69bc51a67..fe0c0c140d8e0364c728784a698c4029018ab92e 100644
--- a/chrome/browser/ui/gtk/gtk_custom_menu_item.cc
+++ b/chrome/browser/ui/gtk/gtk_custom_menu_item.cc
@@ -171,7 +171,7 @@ static void gtk_custom_menu_item_finalize(GObject *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
@@ -212,8 +212,7 @@ static void gtk_custom_menu_item_expose_button(GtkWidget* hbox,
   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);
@@ -253,8 +252,7 @@ static gboolean gtk_custom_menu_item_hbox_expose(GtkWidget* widget,
             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,