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

chrome/browser/ui/gtk/gtk_chrome_shrinkable_hbox.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_shrinkable_hbox.h"
 
 #include <gtk/gtk.h>
 
 #include <algorithm>
 
 namespace {
 
 enum {
   PROP_0,
   PROP_HIDE_CHILD_DIRECTLY
 };
 
 struct SizeAllocateData {
   GtkChromeShrinkableHBox* box;
   GtkAllocation* allocation;
   GtkTextDirection direction;
   bool homogeneous;
   int border_width;
 
   // Maximum child width when |homogeneous| is TRUE.
   int homogeneous_child_width;
 };
 
 void CountVisibleChildren(GtkWidget* child, gpointer userdata) {
-  if (gtk_widget_get_visible(child))
+  if (GTK_WIDGET_VISIBLE(child))
     ++(*reinterpret_cast<int*>(userdata));
 }
 
 void SumChildrenWidthRequisition(GtkWidget* child, gpointer userdata) {
-  if (gtk_widget_get_visible(child)) {
+  if (GTK_WIDGET_VISIBLE(child)) {
     GtkRequisition req;
     gtk_widget_get_child_requisition(child, &req);
     (*reinterpret_cast<int*>(userdata)) += std::max(req.width, 0);
   }
 }
 
 void ShowInvisibleChildren(GtkWidget* child, gpointer userdata) {
-  if (!gtk_widget_get_visible(child)) {
+  if (!GTK_WIDGET_VISIBLE(child)) {
     gtk_widget_show(child);
     ++(*reinterpret_cast<int*>(userdata));
   }
 }
 
 void ChildSizeAllocate(GtkWidget* child, gpointer userdata) {
-  if (!gtk_widget_get_visible(child))
+  if (!GTK_WIDGET_VISIBLE(child))
     return;
 
   SizeAllocateData* data = reinterpret_cast<SizeAllocateData*>(userdata);
   GtkAllocation child_allocation = child->allocation;
 
   if (data->homogeneous) {
     // Make sure the child is not overlapped with others' boundary.
     if (child_allocation.width > data->homogeneous_child_width) {
       child_allocation.x +=
           (child_allocation.width - data->homogeneous_child_width) / 2;
@@ skipping 213 matching lines @@
 
 gint gtk_chrome_shrinkable_hbox_get_visible_child_count(
     GtkChromeShrinkableHBox* box) {
   gint visible_children_count = 0;
   gtk_container_foreach(GTK_CONTAINER(box), CountVisibleChildren,
                         &visible_children_count);
   return visible_children_count;
 }
 
 G_END_DECLS