Merge branch 'master' into native-layoutnative-layout

Conflicts:
	gtk/gtkplug.c
	gtk/gtkscrolledwindow.c

1 files changed, 16 insertions, 15 deletions

diff --git a/gtk/gtkinvisible.c b/gtk/gtkinvisible.c
index 2d8bd65b74..dc349e990b 100644
--- a/gtk/gtkinvisible.c
+++ b/gtk/gtkinvisible.c
@@ -30,7 +30,7 @@
 #include "gtkprivate.h"
 #include "gtkintl.h"
 
-struct _GtkInvisiblePriv
+struct _GtkInvisiblePrivate
 {
   GdkScreen    *screen;
   gboolean      has_user_ref_count;
@@ -93,18 +93,18 @@ gtk_invisible_class_init (GtkInvisibleClass *class)
 							GDK_TYPE_SCREEN,
  							GTK_PARAM_READWRITE));
 
-  g_type_class_add_private (class, sizeof (GtkInvisiblePriv));
+  g_type_class_add_private (class, sizeof (GtkInvisiblePrivate));
 }
 
 static void
 gtk_invisible_init (GtkInvisible *invisible)
 {
-  GtkInvisiblePriv *priv;
+  GtkInvisiblePrivate *priv;
   GdkColormap *colormap;
 
   invisible->priv = G_TYPE_INSTANCE_GET_PRIVATE (invisible,
                                                  GTK_TYPE_INVISIBLE,
-                                                 GtkInvisiblePriv);
+                                                 GtkInvisiblePrivate);
   priv = invisible->priv;
 
   gtk_widget_set_has_window (GTK_WIDGET (invisible), TRUE);
@@ -124,7 +124,7 @@ static void
 gtk_invisible_destroy (GtkObject *object)
 {
   GtkInvisible *invisible = GTK_INVISIBLE (object);
-  GtkInvisiblePriv *priv = invisible->priv;
+  GtkInvisiblePrivate *priv = invisible->priv;
 
   if (priv->has_user_ref_count)
     {
@@ -180,7 +180,7 @@ void
 gtk_invisible_set_screen (GtkInvisible *invisible,
 			  GdkScreen    *screen)
 {
-  GtkInvisiblePriv *priv;
+  GtkInvisiblePrivate *priv;
   GtkWidget *widget;
   GdkScreen *previous_screen;
   gboolean was_realized;
@@ -232,6 +232,7 @@ static void
 gtk_invisible_realize (GtkWidget *widget)
 {
   GdkWindow *parent;
+  GdkWindow *window;
   GdkWindowAttr attributes;
   gint attributes_mask;
 
@@ -252,11 +253,11 @@ gtk_invisible_realize (GtkWidget *widget)
 
   attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_NOREDIR;
 
-  widget->window = gdk_window_new (parent, &attributes, attributes_mask);
-					      
-  gdk_window_set_user_data (widget->window, widget);
-  
-  widget->style = gtk_style_attach (widget->style, widget->window);
+  window = gdk_window_new (parent, &attributes, attributes_mask);
+  gtk_widget_set_window (widget, window);
+  gdk_window_set_user_data (window, widget);
+
+  gtk_widget_style_attach (widget);
 }
 
 static void
@@ -275,10 +276,10 @@ gtk_invisible_show (GtkWidget *widget)
 
 static void
 gtk_invisible_size_allocate (GtkWidget     *widget,
-			    GtkAllocation *allocation)
+                             GtkAllocation *allocation)
 {
-  widget->allocation = *allocation;
-} 
+  gtk_widget_set_allocation (widget, allocation);
+}
 
 
 static void 
@@ -307,7 +308,7 @@ gtk_invisible_get_property  (GObject      *object,
 			     GParamSpec   *pspec)
 {
   GtkInvisible *invisible = GTK_INVISIBLE (object);
-  GtkInvisiblePriv *priv = invisible->priv;
+  GtkInvisiblePrivate *priv = invisible->priv;
 
   switch (prop_id)
     {