summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCST 1998 Shawn T. Amundson <amundson@gtk.org>1998-03-22 16:59:59 +0000
committerShawn Amundson <amundson@src.gnome.org>1998-03-22 16:59:59 +0000
commitac05ab301ddc3590ca55b7dec8c2ac472cedc55d (patch)
tree18b592890884688d9e751feb47f163ed42efb17d
parentde26d9af9b4c9a253c53069f2b82e95a55d8db78 (diff)
downloadgtk+-ac05ab301ddc3590ca55b7dec8c2ac472cedc55d.tar.gz
use button_box for buttons
Sun Mar 22 11:37:51 CST 1998 Shawn T. Amundson <amundson@gtk.org> * gtk/gtkcolorsel.c: * gtk/gtkfilesel.c: use button_box for buttons
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-2-05
-rw-r--r--ChangeLog.pre-2-105
-rw-r--r--ChangeLog.pre-2-25
-rw-r--r--ChangeLog.pre-2-45
-rw-r--r--ChangeLog.pre-2-65
-rw-r--r--ChangeLog.pre-2-85
-rw-r--r--gtk/gtkcolorsel.c5
-rw-r--r--gtk/gtkfilesel.c11
9 files changed, 48 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 0e24a5f1ba..07a06f5524 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Mar 22 11:37:51 CST 1998 Shawn T. Amundson <amundson@gtk.org>
+
+ * gtk/gtkcolorsel.c:
+ * gtk/gtkfilesel.c: use button_box for buttons
+
Sat Mar 21 19:07:01 1998 Owen Taylor <owt1@cornell.edu>
* gtk/testgtk.c (dnd_drop): Don't respond to drops when
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 0e24a5f1ba..07a06f5524 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Sun Mar 22 11:37:51 CST 1998 Shawn T. Amundson <amundson@gtk.org>
+
+ * gtk/gtkcolorsel.c:
+ * gtk/gtkfilesel.c: use button_box for buttons
+
Sat Mar 21 19:07:01 1998 Owen Taylor <owt1@cornell.edu>
* gtk/testgtk.c (dnd_drop): Don't respond to drops when
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0e24a5f1ba..07a06f5524 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Sun Mar 22 11:37:51 CST 1998 Shawn T. Amundson <amundson@gtk.org>
+
+ * gtk/gtkcolorsel.c:
+ * gtk/gtkfilesel.c: use button_box for buttons
+
Sat Mar 21 19:07:01 1998 Owen Taylor <owt1@cornell.edu>
* gtk/testgtk.c (dnd_drop): Don't respond to drops when
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 0e24a5f1ba..07a06f5524 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Sun Mar 22 11:37:51 CST 1998 Shawn T. Amundson <amundson@gtk.org>
+
+ * gtk/gtkcolorsel.c:
+ * gtk/gtkfilesel.c: use button_box for buttons
+
Sat Mar 21 19:07:01 1998 Owen Taylor <owt1@cornell.edu>
* gtk/testgtk.c (dnd_drop): Don't respond to drops when
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 0e24a5f1ba..07a06f5524 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Sun Mar 22 11:37:51 CST 1998 Shawn T. Amundson <amundson@gtk.org>
+
+ * gtk/gtkcolorsel.c:
+ * gtk/gtkfilesel.c: use button_box for buttons
+
Sat Mar 21 19:07:01 1998 Owen Taylor <owt1@cornell.edu>
* gtk/testgtk.c (dnd_drop): Don't respond to drops when
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 0e24a5f1ba..07a06f5524 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Sun Mar 22 11:37:51 CST 1998 Shawn T. Amundson <amundson@gtk.org>
+
+ * gtk/gtkcolorsel.c:
+ * gtk/gtkfilesel.c: use button_box for buttons
+
Sat Mar 21 19:07:01 1998 Owen Taylor <owt1@cornell.edu>
* gtk/testgtk.c (dnd_drop): Don't respond to drops when
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 0e24a5f1ba..07a06f5524 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Sun Mar 22 11:37:51 CST 1998 Shawn T. Amundson <amundson@gtk.org>
+
+ * gtk/gtkcolorsel.c:
+ * gtk/gtkfilesel.c: use button_box for buttons
+
Sat Mar 21 19:07:01 1998 Owen Taylor <owt1@cornell.edu>
* gtk/testgtk.c (dnd_drop): Don't respond to drops when
diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c
index db8ab8aed5..c6332a7529 100644
--- a/gtk/gtkcolorsel.c
+++ b/gtk/gtkcolorsel.c
@@ -17,6 +17,7 @@
*/
#include <math.h>
#include "gtkcolorsel.h"
+#include "gtkhbbox.h"
/*
* If you change the way the color values are stored,
@@ -1447,7 +1448,9 @@ gtk_color_selection_dialog_init (GtkColorSelectionDialog *colorseldiag)
gtk_container_add (GTK_CONTAINER (frame), colorseldiag->colorsel);
gtk_widget_show (colorseldiag->colorsel);
- action_area = gtk_hbox_new (TRUE, 10);
+ action_area = gtk_hbutton_box_new ();
+ gtk_button_box_set_layout(GTK_BUTTON_BOX(action_area), GTK_BUTTONBOX_END);
+ gtk_button_box_set_spacing(GTK_BUTTON_BOX(action_area), 5);
gtk_box_pack_end (GTK_BOX (colorseldiag->main_vbox), action_area, FALSE, FALSE, 0);
gtk_widget_show (action_area);
diff --git a/gtk/gtkfilesel.c b/gtk/gtkfilesel.c
index f1357833f1..a3a4c9e1f3 100644
--- a/gtk/gtkfilesel.c
+++ b/gtk/gtkfilesel.c
@@ -32,6 +32,7 @@
#include "gtkentry.h"
#include "gtkfilesel.h"
#include "gtkhbox.h"
+#include "gtkhbbox.h"
#include "gtklabel.h"
#include "gtklist.h"
#include "gtklistitem.h"
@@ -370,7 +371,9 @@ gtk_file_selection_init (GtkFileSelection *filesel)
gtk_widget_show (filesel->main_vbox);
/* The horizontal box containing create, rename etc. buttons */
- filesel->button_area = gtk_hbox_new (TRUE, 0);
+ filesel->button_area = gtk_hbutton_box_new ();
+ gtk_button_box_set_layout(GTK_BUTTON_BOX(filesel->button_area), GTK_BUTTONBOX_START);
+ gtk_button_box_set_spacing(GTK_BUTTON_BOX(filesel->button_area), 0);
gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->button_area,
FALSE, FALSE, 0);
gtk_widget_show (filesel->button_area);
@@ -424,7 +427,9 @@ gtk_file_selection_init (GtkFileSelection *filesel)
gtk_widget_show (filesel->action_area);
/* The OK/Cancel button area */
- confirm_area = gtk_hbox_new (TRUE, 10);
+ confirm_area = gtk_hbutton_box_new ();
+ gtk_button_box_set_layout(GTK_BUTTON_BOX(confirm_area), GTK_BUTTONBOX_END);
+ gtk_button_box_set_spacing(GTK_BUTTON_BOX(confirm_area), 5);
gtk_box_pack_end (GTK_BOX (filesel->main_vbox), confirm_area, FALSE, FALSE, 0);
gtk_widget_show (confirm_area);
@@ -529,6 +534,8 @@ gtk_file_selection_show_fileop_buttons (GtkFileSelection *filesel)
filesel->fileop_ren_file, TRUE, TRUE, 0);
gtk_widget_show (filesel->fileop_ren_file);
}
+
+ gtk_widget_queue_resize(filesel);
}
void