GTK: Port ui/base/gtk to use avoid deprecated API and accessors

ui/base/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 "ui/base/gtk/gtk_expanded_container.h"
 
 #include <gtk/gtk.h>
 
 #include <algorithm>
 
@@ skipping 50 matching lines @@
     if (child_allocation.height < 0)
       child_allocation.height = child_requisition.height;
   }
 
   int x, y;
   GetChildPosition(data->container, child, &x, &y);
 
   child_allocation.x = x + data->border_width;
   child_allocation.y = y + data->border_width;
 
-  if (GTK_WIDGET_NO_WINDOW(data->container)) {
+  if (!gtk_widget_get_has_window(data->container)) {
     child_allocation.x += data->allocation->x;
     child_allocation.y += data->allocation->y;
   }
   gtk_widget_size_allocate(child, &child_allocation);
 }
 
 void Marshal_VOID__OBJECT_BOXED(GClosure* closure,
                                 GValue* return_value G_GNUC_UNUSED,
                                 guint n_param_values,
                                 const GValue* param_values,
@@ skipping 54 matching lines @@
                    G_TYPE_NONE, 2,
                    GTK_TYPE_WIDGET,
                    GTK_TYPE_REQUISITION | G_SIGNAL_TYPE_STATIC_SCOPE);
 }
 
 static void gtk_expanded_container_init(GtkExpandedContainer* container) {
 }
 
 static void gtk_expanded_container_size_allocate(GtkWidget* widget,
                                                  GtkAllocation* allocation) {
-  widget->allocation = *allocation;
+  gtk_widget_set_allocation(widget, allocation);
 
-  if (!GTK_WIDGET_NO_WINDOW(widget) && gtk_widget_get_realized(widget)) {
-    gdk_window_move_resize(widget->window,
+  if (gtk_widget_get_has_window(widget) && gtk_widget_get_realized(widget)) {
+    gdk_window_move_resize(gtk_widget_get_window(widget),
                            allocation->x,
                            allocation->y,
                            allocation->width,
                            allocation->height);
   }
 
   SizeAllocateData data;
   data.container = widget;
   data.allocation = allocation;
   data.border_width = gtk_container_get_border_width(GTK_CONTAINER(widget));
@@ skipping 16 matching lines @@
                                  GtkWidget* widget, gint x, gint y) {
   g_return_if_fail(GTK_IS_EXPANDED_CONTAINER(container));
   g_return_if_fail(GTK_IS_WIDGET(widget));
   gtk_fixed_move(GTK_FIXED(container), widget, x, y);
 }
 
 void gtk_expanded_container_set_has_window(GtkExpandedContainer* container,
                                            gboolean has_window) {
   g_return_if_fail(GTK_IS_EXPANDED_CONTAINER(container));
   g_return_if_fail(!gtk_widget_get_realized(GTK_WIDGET(container)));
-  gtk_fixed_set_has_window(GTK_FIXED(container), has_window);
+  gtk_widget_set_has_window(GTK_WIDGET(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));
+  return gtk_widget_get_has_window(GTK_WIDGET(container));
 }
 
 G_END_DECLS