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

chrome/browser/ui/gtk/gtk_expanded_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_expanded_container.h"
 
 #include <gtk/gtk.h>
 
 #include <algorithm>
 
@@ skipping 16 matching lines @@
   GValue v = { 0 };
   g_value_init(&v, G_TYPE_INT);
   gtk_container_child_get_property(GTK_CONTAINER(container), child, "x", &v);
   *x = g_value_get_int(&v);
   gtk_container_child_get_property(GTK_CONTAINER(container), child, "y", &v);
   *y = g_value_get_int(&v);
   g_value_unset(&v);
 }
 
 void ChildSizeAllocate(GtkWidget* child, gpointer userdata) {
-  if (!gtk_widget_get_visible(child))
+  if (!GTK_WIDGET_VISIBLE(child))
     return;
 
   SizeAllocateData* data = reinterpret_cast<SizeAllocateData*>(userdata);
 
   GtkRequisition child_requisition;
   child_requisition.width = data->allocation->width - data->border_width * 2;
   child_requisition.height = data->allocation->height - data->border_width * 2;
 
   // We need to give whoever is pulling our strings a chance to adjust the
   // size of our children.
@@ skipping 136 matching lines @@
   gtk_fixed_set_has_window(GTK_FIXED(container), has_window);
 }
 
 gboolean gtk_expanded_container_get_has_window(
     GtkExpandedContainer* container) {
   g_return_val_if_fail(GTK_IS_EXPANDED_CONTAINER(container), FALSE);
   return gtk_fixed_get_has_window(GTK_FIXED(container));
 }
 
 G_END_DECLS