GTK: Do more GSEALing.

ui/gfx/gtk_preserve_window.cc

 // Copyright (c) 2012 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/gfx/gtk_preserve_window.h"
 
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
 #include "ui/base/gtk/gtk_compat.h"
@@ skipping 115 matching lines @@
 
     // This is the behavior from GtkWidget, inherited by GtkFixed.
     // It is unclear why we should not call the potentially overridden
     // unrealize method (via the callback), but doing so causes errors.
     container_class->forall(
         GTK_CONTAINER(widget), FALSE,
         reinterpret_cast<GtkCallback>(gtk_widget_unrealize), NULL);
 
     GdkWindow* gdk_window = gtk_widget_get_window(widget);
 
-    gtk_style_detach(widget->style);
+    // TODO(erg): Almost all style handling will need to be overhauled in GTK3.
+    gtk_style_detach(gtk_widget_get_style(widget));
     gdk_window_reparent(gdk_window, gdk_get_default_root_window(), 0, 0);
     gtk_selection_remove_all(widget);
     gdk_window_set_user_data(gdk_window, NULL);
 
     gtk_widget_set_realized(widget, FALSE);
   } else {
     GTK_WIDGET_CLASS(gtk_preserve_window_parent_class)->unrealize(widget);
   }
 }
 
@@ skipping 53 matching lines @@
     if (priv->delegate_resize) {
       gdk_window_move(gdk_window, allocation->x, allocation->y);
     } else {
       gdk_window_move_resize(
           gdk_window, allocation->x, allocation->y,
           allocation->width, allocation->height);
     }
   }
 
   // Propagate resize to children
-  guint16 border_width = GTK_CONTAINER(widget)->border_width;
+  guint16 border_width = gtk_container_get_border_width(GTK_CONTAINER(widget));
   GList *children = GTK_FIXED(widget)->children;
   while (children) {
     GtkFixedChild *child = reinterpret_cast<GtkFixedChild*>(children->data);
     if (gtk_widget_get_visible(child->widget)) {
       GtkRequisition child_requisition;
       gtk_widget_get_child_requisition(child->widget, &child_requisition);
 
       GtkAllocation child_allocation;
       child_allocation.x = child->x + border_width;
       child_allocation.y = child->y + border_width;
       child_allocation.width = child_requisition.width;
       child_allocation.height = child_requisition.height;
 
       gtk_widget_size_allocate(child->widget, &child_allocation);
     }
     children = children->next;
   }
 }
 
 void gtk_preserve_window_delegate_resize(GtkPreserveWindow* widget,
                                          gboolean delegate) {
   GtkPreserveWindowPrivate* priv = GTK_PRESERVE_WINDOW_GET_PRIVATE(widget);
   priv->delegate_resize = delegate;
 }
 
 G_END_DECLS