textview: Use GtkSelectionWindow for touch text selection

[~andy/gtk] / gtk / gtkbox.c

diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c
index d41d66e759785cd52e6f3ad37001bd640cf520ff..5c8e6e3ff839b4132cf1fb09aa1255ffe07320e2 100644 (file)
--- a/gtk/gtkbox.c
+++ b/gtk/gtkbox.c
@@ -87,7 +87,7 @@
 #include "gtksizerequest.h"
 #include "gtkwidgetpath.h"
 #include "gtkwidgetprivate.h"
-#include "a11y/gtkboxaccessible.h"
+#include "a11y/gtkcontaineraccessible.h"
 
 
 enum {
@@ -317,7 +317,7 @@ gtk_box_class_init (GtkBoxClass *class)
 
   g_type_class_add_private (object_class, sizeof (GtkBoxPrivate));
 
-  gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_BOX_ACCESSIBLE);
+  gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_FILLER);
 }
 
 static void
@@ -1763,7 +1763,7 @@ gtk_box_set_child_packing (GtkBox      *box,
         pack_type = GTK_PACK_START;
       if (child_info->pack != pack_type)
         {
-         child_info->pack = GTK_PACK_END;
+         child_info->pack = pack_type;
           gtk_widget_child_notify (child, "pack-type");
           gtk_box_invalidate_order (box);
         }