Only in ../gtk+-prima/gtk: .deps
Only in ../gtk+-prima/gtk: Makefile
diff -ur gtk/Makefile.am ../gtk+-prima/gtk/Makefile.am
--- gtk/Makefile.am	Sun Aug  3 00:28:49 1997
+++ ../gtk+-prima/gtk/Makefile.am	Sun Sep 14 13:03:51 1997
@@ -11,6 +11,7 @@
 	gtkalignment.c		\
 	gtkarrow.c		\
 	gtkbin.c		\
+	gtkbbox.c		\
 	gtkbox.c		\
 	gtkbutton.c		\
 	gtkcheckbutton.c	\
@@ -26,6 +27,7 @@
 	gtkfilesel.c		\
 	gtkframe.c		\
 	gtkgc.c			\
+	gtkhbbox.c		\
 	gtkhbox.c		\
 	gtkhpaned.c		\
 	gtkhruler.c		\
@@ -70,6 +72,7 @@
 	gtktree.c		\
 	gtktreeitem.c		\
 	gtktypeutils.c		\
+	gtkvbbox.c		\
 	gtkvbox.c		\
 	gtkviewport.c		\
 	gtkvpaned.c		\
@@ -90,6 +93,7 @@
 	gtkalignment.h		\
 	gtkarrow.h		\
 	gtkbin.h		\
+	gtkbbox.h		\
 	gtkbox.h		\
 	gtkbutton.h		\
 	gtkcheckbutton.h	\
@@ -106,6 +110,7 @@
 	gtkfilesel.h		\
 	gtkframe.h		\
 	gtkgc.h			\
+	gtkhbbox.h		\
 	gtkhbox.h		\
 	gtkhpaned.h		\
 	gtkhruler.h		\
@@ -150,6 +155,7 @@
 	gtktree.h		\
 	gtktreeitem.h		\
 	gtktypeutils.h		\
+	gtkvbbox.h		\
 	gtkvbox.h		\
 	gtkviewport.h		\
 	gtkvpaned.h		\
diff -ur gtk/gtk.h ../gtk+-prima/gtk/gtk.h
--- gtk/gtk.h	Sun Aug  3 00:29:43 1997
+++ ../gtk+-prima/gtk/gtk.h	Thu Sep  4 22:29:36 1997
@@ -27,6 +27,7 @@
 #include <gtk/gtkarrow.h>
 #include <gtk/gtkbin.h>
 #include <gtk/gtkbox.h>
+#include <gtk/gtkbbox.h>
 #include <gtk/gtkbutton.h>
 #include <gtk/gtkcheckbutton.h>
 #include <gtk/gtkcheckmenuitem.h>
@@ -43,6 +44,7 @@
 #include <gtk/gtkframe.h>
 #include <gtk/gtkgc.h>
 #include <gtk/gtkhbox.h>
+#include <gtk/gtkhbbox.h>
 #include <gtk/gtkhpaned.h>
 #include <gtk/gtkhruler.h>
 #include <gtk/gtkhscale.h>
@@ -87,6 +89,7 @@
 #include <gtk/gtktreeitem.h>
 #include <gtk/gtktypeutils.h>
 #include <gtk/gtkvbox.h>
+#include <gtk/gtkvbbox.h>
 #include <gtk/gtkviewport.h>
 #include <gtk/gtkvpaned.h>
 #include <gtk/gtkvruler.h>
@@ -95,6 +98,7 @@
 #include <gtk/gtkvseparator.h>
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkwindow.h>
+
 
 
 #endif /* __GTK_H__ */
Only in ../gtk+-prima/gtk: gtkbbox.c
Only in ../gtk+-prima/gtk: gtkbbox.h
Only in ../gtk+-prima/gtk: gtkbbox.h~
Only in ../gtk+-prima/gtk: gtkhbbox.c
Only in ../gtk+-prima/gtk: gtkhbbox.c~
Only in ../gtk+-prima/gtk: gtkhbbox.h
Only in ../gtk+-prima/gtk: gtkhbbox.h~
Only in ../gtk+-prima/gtk: gtkvbbox.c
Only in ../gtk+-prima/gtk: gtkvbbox.h
Only in ../gtk+-prima/gtk: gtkvbbox.h~
diff -ur gtk/testgtk.c ../gtk+-prima/gtk/testgtk.c
--- gtk/testgtk.c	Thu Jul 31 09:42:43 1997
+++ ../gtk+-prima/gtk/testgtk.c	Sun Sep 14 14:13:36 1997
@@ -384,6 +384,142 @@
     gtk_widget_destroy (window);
 }
 
+
+
+void
+bbox_widget_destroy (GtkWidget* widget, GtkWidget* todestroy)
+{
+  gtk_widget_hide (todestroy);
+  gtk_widget_destroy (todestroy);
+}
+
+void
+create_bbox_window (gint horizontal, char* title, gint pos, gint spacing,
+			 gint child_w, gint child_h, gint layout)
+{
+  GtkWidget* window;
+  GtkWidget* box1;
+  GtkWidget* bbox;
+  GtkWidget* button;
+	
+		/* create a new window */
+  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  gtk_window_set_title (GTK_WINDOW (window),
+			title);
+
+  gtk_signal_connect (GTK_OBJECT (window), "destroy",
+		      (GtkSignalFunc) bbox_widget_destroy, window);
+
+  
+  if (horizontal)
+  {
+    gtk_widget_set_usize (window, 550, 60);
+    gtk_widget_set_uposition (window, 150, pos);
+    box1 = gtk_vbox_new (FALSE, 0);
+  }
+  else
+  {
+    gtk_widget_set_usize (window, 150, 400);
+    gtk_widget_set_uposition (window, pos, 200);
+    box1 = gtk_vbox_new (FALSE, 0);
+  }
+  
+  gtk_container_add (GTK_CONTAINER (window), box1);
+  gtk_widget_show (box1);
+  
+  if (horizontal)
+    bbox = gtk_hbutton_box_new();
+  else
+    bbox = gtk_vbutton_box_new();
+  gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), layout);
+  gtk_button_box_set_spacing (GTK_BUTTON_BOX (bbox), spacing);
+  gtk_button_box_set_child_size (GTK_BUTTON_BOX (bbox), child_w, child_h);
+  gtk_widget_show (bbox);
+  
+  gtk_container_border_width (GTK_CONTAINER(box1), 25);
+  gtk_box_pack_start (GTK_BOX (box1), bbox, TRUE, TRUE, 0);
+  
+  button = gtk_button_new_with_label ("OK");
+  gtk_container_add (GTK_CONTAINER(bbox), button);
+
+  gtk_signal_connect (GTK_OBJECT (button), "clicked",
+		      (GtkSignalFunc) bbox_widget_destroy, window);
+
+  gtk_widget_show (button);
+  
+  button = gtk_button_new_with_label ("Cancel");
+  gtk_container_add (GTK_CONTAINER(bbox), button);
+  gtk_widget_show (button);
+  
+  button = gtk_button_new_with_label ("Help");
+  gtk_container_add (GTK_CONTAINER(bbox), button);
+  gtk_widget_show (button);
+  
+  gtk_widget_show (window);
+}
+
+void
+test_hbbox ()
+{
+  create_bbox_window (TRUE, "Spread",    50, 40, 85, 28, GTK_BUTTONBOX_SPREAD);
+  create_bbox_window (TRUE, "Edge",     200, 40, 85, 25, GTK_BUTTONBOX_EDGE);
+  create_bbox_window (TRUE, "Start",    350, 40, 85, 25, GTK_BUTTONBOX_START);
+  create_bbox_window (TRUE, "End",      500, 15, 30, 25, GTK_BUTTONBOX_END);
+}
+
+void
+test_vbbox ()
+{
+  create_bbox_window (FALSE, "Spread",    50, 40, 85, 25, GTK_BUTTONBOX_SPREAD);
+  create_bbox_window (FALSE, "Edge",     250, 40, 85, 28, GTK_BUTTONBOX_EDGE);
+  create_bbox_window (FALSE, "Start",    450, 40, 85, 25, GTK_BUTTONBOX_START);
+  create_bbox_window (FALSE, "End",      650, 15, 30, 25, GTK_BUTTONBOX_END);
+} 
+
+void
+create_button_box ()
+{
+  static GtkWidget* window = 0;
+  GtkWidget* bbox;
+  GtkWidget* button;
+	
+  if (window && GTK_WIDGET_VISIBLE (window))
+  {
+    gtk_widget_hide (window);
+    gtk_widget_destroy (window);
+    window = 0;
+    return;
+  }
+  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  gtk_window_set_title (GTK_WINDOW (window),
+			"Button Box Test");
+
+  gtk_signal_connect (GTK_OBJECT (window), "destroy",
+		      (GtkSignalFunc) bbox_widget_destroy, window);
+
+  gtk_container_border_width (GTK_CONTAINER (window), 20);
+
+	  /* these 15 lines are a nice and easy example for GtkHButtonBox */
+  bbox = gtk_hbutton_box_new ();
+  gtk_container_add (GTK_CONTAINER (window), bbox);
+  gtk_widget_show (bbox);
+  
+  button = gtk_button_new_with_label ("Horizontal");
+  gtk_signal_connect (GTK_OBJECT (button), "clicked",
+		      (GtkSignalFunc) test_hbbox, 0);
+  gtk_container_add (GTK_CONTAINER (bbox), button);
+  gtk_widget_show (button);
+  
+  button = gtk_button_new_with_label ("Vertical");
+  gtk_signal_connect (GTK_OBJECT (button), "clicked",
+		      (GtkSignalFunc) test_vbbox, 0);
+  gtk_container_add (GTK_CONTAINER (bbox), button);
+  gtk_widget_show (button);
+
+  gtk_widget_show (window);
+}
+
+
 void
 reparent_label (GtkWidget *widget,
 		GtkWidget *new_parent)
@@ -2151,6 +2287,7 @@
       { "toggle buttons", create_toggle_buttons },
       { "check buttons", create_check_buttons },
       { "radio buttons", create_radio_buttons },
+      { "button box", create_button_box },
       { "reparent", create_reparent },
       { "pixmap", create_pixmap },
       { "tooltips", create_tooltips },
