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

chrome/browser/ui/gtk/gtk_chrome_link_button.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_chrome_link_button.h"
 
 #include <stdlib.h>
 
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "ui/gfx/gtk_util.h"
@@ skipping 93 matching lines @@
   gtk_label_set_markup(GTK_LABEL(button->label),
       button->using_native_theme ? button->native_markup :
       button->normal_markup);
 }
 
 static void gtk_chrome_link_button_style_changed(GtkChromeLinkButton* button) {
   // Regenerate the link with the possibly new colors after the user has
   // changed his GTK style.
   gtk_chrome_link_button_set_text(button);
 
-  if (GTK_WIDGET_VISIBLE(button))
+  if (gtk_widget_get_visible(GTK_WIDGET(button)))
     gtk_widget_queue_draw(GTK_WIDGET(button));
 }
 
 static gboolean gtk_chrome_link_button_expose(GtkWidget* widget,
                                               GdkEventExpose* event) {
   GtkChromeLinkButton* button = GTK_CHROME_LINK_BUTTON(widget);
   GtkWidget* label = button->label;
 
-  if (GTK_WIDGET_STATE(widget) == GTK_STATE_ACTIVE && button->is_normal) {
+  if (gtk_widget_get_state(widget) == GTK_STATE_ACTIVE && button->is_normal) {
     gtk_label_set_markup(GTK_LABEL(label), button->pressed_markup);
     button->is_normal = FALSE;
-  } else if (GTK_WIDGET_STATE(widget) != GTK_STATE_ACTIVE &&
+  } else if (gtk_widget_get_state(widget) != GTK_STATE_ACTIVE &&
              !button->is_normal) {
     gtk_label_set_markup(GTK_LABEL(label),
         button->using_native_theme ? button->native_markup :
                                      button->normal_markup);
     button->is_normal = TRUE;
   }
 
   // Draw the link inside the button.
   gtk_container_propagate_expose(GTK_CONTAINER(widget), label, event);
 
   // Draw the focus rectangle.
-  if (GTK_WIDGET_HAS_FOCUS(widget)) {
+  if (gtk_widget_has_focus(widget)) {
     gtk_paint_focus(widget->style, widget->window,
-                    static_cast<GtkStateType>(GTK_WIDGET_STATE(widget)),
+                    gtk_widget_get_state(widget),
                     &event->area, widget, NULL,
                     widget->allocation.x, widget->allocation.y,
                     widget->allocation.width, widget->allocation.height);
   }
 
   return TRUE;
 }
 
 static void gtk_chrome_link_button_enter(GtkButton* button) {
   GtkWidget* widget = GTK_WIDGET(button);
@@ skipping 70 matching lines @@
   return lb;
 }
 
 void gtk_chrome_link_button_set_use_gtk_theme(GtkChromeLinkButton* button,
                                               gboolean use_gtk) {
   if (use_gtk != button->using_native_theme) {
     button->using_native_theme = use_gtk;
 
     gtk_chrome_link_button_set_text(button);
 
-    if (GTK_WIDGET_VISIBLE(button))
+    if (gtk_widget_get_visible(GTK_WIDGET(button)))
       gtk_widget_queue_draw(GTK_WIDGET(button));
   }
 }
 
 void gtk_chrome_link_button_set_label(GtkChromeLinkButton* button,
                                       const char* text) {
   g_free(button->text);
   button->text = g_strdup(text);
 
   gtk_chrome_link_button_set_text(button);
 
-  if (GTK_WIDGET_VISIBLE(button))
+  if (gtk_widget_get_visible(GTK_WIDGET(button)))
     gtk_widget_queue_draw(GTK_WIDGET(button));
 }
 
 void gtk_chrome_link_button_set_normal_color(GtkChromeLinkButton* button,
                                              const GdkColor* color) {
   if (color) {
     snprintf(button->normal_color, 9, "#%02X%02X%02X", color->red / 257,
              color->green / 257, color->blue / 257);
   } else {
     strncpy(button->normal_color, "blue", 9);
   }
 
   gtk_chrome_link_button_set_text(button);
 
-  if (GTK_WIDGET_VISIBLE(button))
+  if (gtk_widget_get_visible(GTK_WIDGET(button)))
     gtk_widget_queue_draw(GTK_WIDGET(button));
 }
 
 G_END_DECLS