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

chrome/browser/ui/gtk/gtk_floating_container.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_floating_container.h"
 
 #include <gtk/gtk.h>
 #include <gtk/gtkmarshal.h>
 #include <gtk/gtkprivate.h>
 
@@ skipping 129 matching lines @@
     // Handle the other case where it's in our |floating_children| list.
     GtkFloatingContainer* floating = GTK_FLOATING_CONTAINER(container);
     GList* children = floating->floating_children;
     gboolean removed_child = false;
     while (children) {
       GtkFloatingContainerChild* child =
           reinterpret_cast<GtkFloatingContainerChild*>(children->data);
 
       if (child->widget == widget) {
         removed_child = true;
-        gboolean was_visible = GTK_WIDGET_VISIBLE(widget);
+        gboolean was_visible = gtk_widget_get_visible(GTK_WIDGET(widget));
 
         gtk_widget_unparent(widget);
 
         floating->floating_children =
             g_list_remove_link(floating->floating_children, children);
         g_list_free(children);
         g_free(child);
 
-        if (was_visible && GTK_WIDGET_VISIBLE(container))
+        if (was_visible && gtk_widget_get_visible(GTK_WIDGET(container)))
           gtk_widget_queue_resize(GTK_WIDGET(container));
 
         break;
       }
       children = children->next;
     }
 
     g_return_if_fail(removed_child);
   }
 }
@@ skipping 59 matching lines @@
   // to be.
   GtkFloatingContainer* container = GTK_FLOATING_CONTAINER(widget);
   GList* children = container->floating_children;
   GtkAllocation child_allocation;
   GtkRequisition child_requisition;
   while (children) {
     GtkFloatingContainerChild* child =
         reinterpret_cast<GtkFloatingContainerChild*>(children->data);
     children = children->next;
 
-    if (GTK_WIDGET_VISIBLE(child->widget)) {
+    if (gtk_widget_get_visible(GTK_WIDGET(child->widget))) {
       gtk_widget_size_request(child->widget, &child_requisition);
       child_allocation.x = allocation->x + child->x;
       child_allocation.y = allocation->y + child->y;
       child_allocation.width = std::max(1, std::min(child_requisition.width,
                                                     allocation->width));
       child_allocation.height = std::max(1, std::min(child_requisition.height,
                                                      allocation->height));
       gtk_widget_size_allocate(child->widget, &child_allocation);
     }
   }
@@ skipping 61 matching lines @@
   child_info->x = 0;
   child_info->y = 0;
 
   gtk_widget_set_parent(widget, GTK_WIDGET(container));
 
   container->floating_children =
       g_list_append(container->floating_children, child_info);
 }
 
 G_END_DECLS