callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use button_box for buttons

Browse Source 
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
This commit is contained in:
CST 1998 Shawn T. Amundson
1998-03-22 16:59:59 +00:00
committed by Shawn Amundson
parent de26d9af9b
commit ac05ab301d
9 changed files with 48 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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> Sat Mar 21 19:07:01 1998 Owen Taylor <owt1@cornell.edu>
* gtk/testgtk.c (dnd_drop): Don't respond to drops when * gtk/testgtk.c (dnd_drop): Don't respond to drops when

5
ChangeLog.pre-2-0
View File

@ -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> Sat Mar 21 19:07:01 1998 Owen Taylor <owt1@cornell.edu>
* gtk/testgtk.c (dnd_drop): Don't respond to drops when * gtk/testgtk.c (dnd_drop): Don't respond to drops when

5
ChangeLog.pre-2-10
View File

@ -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> Sat Mar 21 19:07:01 1998 Owen Taylor <owt1@cornell.edu>
* gtk/testgtk.c (dnd_drop): Don't respond to drops when * gtk/testgtk.c (dnd_drop): Don't respond to drops when

5
ChangeLog.pre-2-2
View File

@ -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> Sat Mar 21 19:07:01 1998 Owen Taylor <owt1@cornell.edu>
* gtk/testgtk.c (dnd_drop): Don't respond to drops when * gtk/testgtk.c (dnd_drop): Don't respond to drops when

5
ChangeLog.pre-2-4
View File

@ -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> Sat Mar 21 19:07:01 1998 Owen Taylor <owt1@cornell.edu>
* gtk/testgtk.c (dnd_drop): Don't respond to drops when * gtk/testgtk.c (dnd_drop): Don't respond to drops when

5
ChangeLog.pre-2-6
View File

@ -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> Sat Mar 21 19:07:01 1998 Owen Taylor <owt1@cornell.edu>
* gtk/testgtk.c (dnd_drop): Don't respond to drops when * gtk/testgtk.c (dnd_drop): Don't respond to drops when

5
ChangeLog.pre-2-8
View File

@ -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> Sat Mar 21 19:07:01 1998 Owen Taylor <owt1@cornell.edu>
* gtk/testgtk.c (dnd_drop): Don't respond to drops when * gtk/testgtk.c (dnd_drop): Don't respond to drops when

5
gtk/gtkcolorsel.c
View File

@ -17,6 +17,7 @@
*/ */
#include <math.h> #include <math.h>
#include "gtkcolorsel.h" #include "gtkcolorsel.h"
#include "gtkhbbox.h"
/* /*
* If you change the way the color values are stored, * 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_container_add (GTK_CONTAINER (frame), colorseldiag->colorsel);
gtk_widget_show (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_box_pack_end (GTK_BOX (colorseldiag->main_vbox), action_area, FALSE, FALSE, 0);
gtk_widget_show (action_area); gtk_widget_show (action_area);

11
gtk/gtkfilesel.c
View File

@ -32,6 +32,7 @@
#include "gtkentry.h" #include "gtkentry.h"
#include "gtkfilesel.h" #include "gtkfilesel.h"
#include "gtkhbox.h" #include "gtkhbox.h"
#include "gtkhbbox.h"
#include "gtklabel.h" #include "gtklabel.h"
#include "gtklist.h" #include "gtklist.h"
#include "gtklistitem.h" #include "gtklistitem.h"
@ -370,7 +371,9 @@ gtk_file_selection_init (GtkFileSelection *filesel)
gtk_widget_show (filesel->main_vbox); gtk_widget_show (filesel->main_vbox);
/* The horizontal box containing create, rename etc. buttons */ /* 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, gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->button_area,
FALSE, FALSE, 0); FALSE, FALSE, 0);
gtk_widget_show (filesel->button_area); gtk_widget_show (filesel->button_area);
@ -424,7 +427,9 @@ gtk_file_selection_init (GtkFileSelection *filesel)
gtk_widget_show (filesel->action_area); gtk_widget_show (filesel->action_area);
/* The OK/Cancel button 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_box_pack_end (GTK_BOX (filesel->main_vbox), confirm_area, FALSE, FALSE, 0);
gtk_widget_show (confirm_area); gtk_widget_show (confirm_area);
@ -529,6 +534,8 @@ gtk_file_selection_show_fileop_buttons (GtkFileSelection *filesel)
filesel->fileop_ren_file, TRUE, TRUE, 0); filesel->fileop_ren_file, TRUE, TRUE, 0);
gtk_widget_show (filesel->fileop_ren_file); gtk_widget_show (filesel->fileop_ren_file);
} }
gtk_widget_queue_resize(filesel);
} }
void void