1997-11-24 22:37:52 +00:00
|
|
|
/* GTK - The GIMP Toolkit
|
|
|
|
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
|
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
2000-07-26 11:33:08 +00:00
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
1997-11-24 22:37:52 +00:00
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
* version 2 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
2000-07-26 11:33:08 +00:00
|
|
|
* Lesser General Public License for more details.
|
1997-11-24 22:37:52 +00:00
|
|
|
*
|
2000-07-26 11:33:08 +00:00
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
1998-04-13 02:02:47 +00:00
|
|
|
* License along with this library; if not, write to the
|
|
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
* Boston, MA 02111-1307, USA.
|
1997-11-24 22:37:52 +00:00
|
|
|
*/
|
1999-02-24 07:37:18 +00:00
|
|
|
|
|
|
|
/*
|
2000-07-26 11:33:08 +00:00
|
|
|
* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
|
1999-02-24 07:37:18 +00:00
|
|
|
* file for a list of people on the GTK+ Team. See the ChangeLog
|
|
|
|
* files for a list of changes. These files are distributed with
|
|
|
|
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
|
|
|
|
*/
|
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
#include "gtkbbox.h"
|
fix warning
2001-04-27 Havoc Pennington <hp@redhat.com>
* gtk/gtkcombo.c (gtk_combo_popup_button_press): fix warning
* gtk/gtkmessagedialog.c (gtk_message_dialog_init): make messages selectable
* gtk/gtkentry.c (gtk_entry_real_insert_text): don't strip
line/para separators
(gtk_entry_create_layout): set single paragraph mode on the layout
* gtk/gtkbutton.c (gtk_button_new_from_stock): don't put much
spacing between the image and label; instead, inside a button box
the button will get extra space that will go there, but if people
configure button box for 0 chubbiness, then there's no spacing.
* gtk/gtkbbox.c (gtk_button_box_class_init): Make child ipadding
and min/max size style properties, so people can tune their
chubbiness.
* tests/testgtk.c (make_toolbar): remove calls to removed toolbar
functions
* gtk/gtktoolbar.c (gtk_toolbar_class_init): Make space_size,
space_style, and button_relief into style properties, remove
functions for setting them
* gtk/gtkmenu.c (gtk_menu_key_press): handle menu bar accel to pop
it back down
* gtk/gtkoptionmenu.c (gtk_option_menu_get_props): free boxed
types from gtk_widget_style_get
* gtk/gtkmenubar.c (gtk_menu_bar_set_shadow_type): Remove, replace
with a style property.
* gdk/x11/gdkevents-x11.c: namespace the settings
* gtk/gtkmenubar.c: Add F10 accelerator to move between menubars.
* gtk/gtksettings.c (gtk_settings_class_init): remove code with
side effects from inside g_assert(), so that G_DISABLE_ASSERT can
be used. Also, translate doc strings for settings. Also, namespace
the double-click-time property. Also, remove bell properties crap.
2001-04-28 00:12:47 +00:00
|
|
|
#include "gtkintl.h"
|
1997-11-24 22:37:52 +00:00
|
|
|
|
2001-05-17 16:22:06 +00:00
|
|
|
enum {
|
|
|
|
PROP_0,
|
|
|
|
PROP_LAYOUT_STYLE,
|
|
|
|
PROP_LAST
|
|
|
|
};
|
1997-11-24 22:37:52 +00:00
|
|
|
|
2001-07-06 02:10:32 +00:00
|
|
|
enum {
|
|
|
|
CHILD_PROP_0,
|
|
|
|
CHILD_PROP_SECONDARY
|
|
|
|
};
|
|
|
|
|
|
|
|
static void gtk_button_box_class_init (GtkButtonBoxClass *klass);
|
|
|
|
static void gtk_button_box_init (GtkButtonBox *box);
|
|
|
|
static void gtk_button_box_set_property (GObject *object,
|
|
|
|
guint prop_id,
|
|
|
|
const GValue *value,
|
|
|
|
GParamSpec *pspec);
|
|
|
|
static void gtk_button_box_get_property (GObject *object,
|
|
|
|
guint prop_id,
|
|
|
|
GValue *value,
|
|
|
|
GParamSpec *pspec);
|
|
|
|
static void gtk_button_box_set_child_property (GtkContainer *container,
|
|
|
|
GtkWidget *child,
|
|
|
|
guint property_id,
|
|
|
|
const GValue *value,
|
|
|
|
GParamSpec *pspec);
|
|
|
|
static void gtk_button_box_get_child_property (GtkContainer *container,
|
|
|
|
GtkWidget *child,
|
|
|
|
guint property_id,
|
|
|
|
GValue *value,
|
|
|
|
GParamSpec *pspec);
|
1997-11-24 22:37:52 +00:00
|
|
|
|
fix warning
2001-04-27 Havoc Pennington <hp@redhat.com>
* gtk/gtkcombo.c (gtk_combo_popup_button_press): fix warning
* gtk/gtkmessagedialog.c (gtk_message_dialog_init): make messages selectable
* gtk/gtkentry.c (gtk_entry_real_insert_text): don't strip
line/para separators
(gtk_entry_create_layout): set single paragraph mode on the layout
* gtk/gtkbutton.c (gtk_button_new_from_stock): don't put much
spacing between the image and label; instead, inside a button box
the button will get extra space that will go there, but if people
configure button box for 0 chubbiness, then there's no spacing.
* gtk/gtkbbox.c (gtk_button_box_class_init): Make child ipadding
and min/max size style properties, so people can tune their
chubbiness.
* tests/testgtk.c (make_toolbar): remove calls to removed toolbar
functions
* gtk/gtktoolbar.c (gtk_toolbar_class_init): Make space_size,
space_style, and button_relief into style properties, remove
functions for setting them
* gtk/gtkmenu.c (gtk_menu_key_press): handle menu bar accel to pop
it back down
* gtk/gtkoptionmenu.c (gtk_option_menu_get_props): free boxed
types from gtk_widget_style_get
* gtk/gtkmenubar.c (gtk_menu_bar_set_shadow_type): Remove, replace
with a style property.
* gdk/x11/gdkevents-x11.c: namespace the settings
* gtk/gtkmenubar.c: Add F10 accelerator to move between menubars.
* gtk/gtksettings.c (gtk_settings_class_init): remove code with
side effects from inside g_assert(), so that G_DISABLE_ASSERT can
be used. Also, translate doc strings for settings. Also, namespace
the double-click-time property. Also, remove bell properties crap.
2001-04-28 00:12:47 +00:00
|
|
|
#define DEFAULT_CHILD_MIN_WIDTH 85
|
|
|
|
#define DEFAULT_CHILD_MIN_HEIGHT 27
|
2001-04-30 23:23:54 +00:00
|
|
|
#define DEFAULT_CHILD_IPAD_X 4
|
fix warning
2001-04-27 Havoc Pennington <hp@redhat.com>
* gtk/gtkcombo.c (gtk_combo_popup_button_press): fix warning
* gtk/gtkmessagedialog.c (gtk_message_dialog_init): make messages selectable
* gtk/gtkentry.c (gtk_entry_real_insert_text): don't strip
line/para separators
(gtk_entry_create_layout): set single paragraph mode on the layout
* gtk/gtkbutton.c (gtk_button_new_from_stock): don't put much
spacing between the image and label; instead, inside a button box
the button will get extra space that will go there, but if people
configure button box for 0 chubbiness, then there's no spacing.
* gtk/gtkbbox.c (gtk_button_box_class_init): Make child ipadding
and min/max size style properties, so people can tune their
chubbiness.
* tests/testgtk.c (make_toolbar): remove calls to removed toolbar
functions
* gtk/gtktoolbar.c (gtk_toolbar_class_init): Make space_size,
space_style, and button_relief into style properties, remove
functions for setting them
* gtk/gtkmenu.c (gtk_menu_key_press): handle menu bar accel to pop
it back down
* gtk/gtkoptionmenu.c (gtk_option_menu_get_props): free boxed
types from gtk_widget_style_get
* gtk/gtkmenubar.c (gtk_menu_bar_set_shadow_type): Remove, replace
with a style property.
* gdk/x11/gdkevents-x11.c: namespace the settings
* gtk/gtkmenubar.c: Add F10 accelerator to move between menubars.
* gtk/gtksettings.c (gtk_settings_class_init): remove code with
side effects from inside g_assert(), so that G_DISABLE_ASSERT can
be used. Also, translate doc strings for settings. Also, namespace
the double-click-time property. Also, remove bell properties crap.
2001-04-28 00:12:47 +00:00
|
|
|
#define DEFAULT_CHILD_IPAD_Y 0
|
1997-11-24 22:37:52 +00:00
|
|
|
|
fixed an assertment.
Sat Jun 6 06:01:24 1998 Tim Janik <timj@gtk.org>
* gtk/gtksignal.c (gtk_signal_emitv): fixed an assertment.
* gtk/makeenums.awk: a script to generate the GtkEnumValue arrays from,
this should eventually be done by gentypeinfo.el somewhen.
* gtk/gtkenumvalues.c: new generated file to hold GtkEnumValue arrays.
* gtk/gtktypeutils.h: new function gtk_enum_values() to retrive all the
enum values of an enum type.
* gtk/gtk.defs:
* gtk/gtkcurve.h:
* gtk/gtkobject.h:
* gtk/gtkprivate.h:
* gtk/gtkwidget.h:
* gtk/gtkenums.h:
brought enum/flags definitions in sync, added a few more enum
definitions for bindings and pattern matching.
* some more macro and GtkType fixups in various places.
* gdk/gdktypes.h (enum): added a new value GDK_AFTER_MASK, which is used
as a key-release modifier for the binding system.
Fri Jun 5 06:06:06 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmenu.h (struct _GtkMenu): removed GList*children, since it
was a stale list pointer that is already present in GtkMenuShell.
* gtk/gtkmenushell.h (struct _GtkMenuShellClass): added a signal
GtkMenuShell::selection_done which is emitted after the menu shell
poped down again and all possible menu items have been activated.
Thu Jun 4 02:20:42 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmenushell.c (gtk_menu_shell_button_release): flush the x-queue
before activation of the menuitem, so the menu is actually taken off the
screen prior to any menu item activation.
* gtk/gtkctree.c (gtk_ctree_get_row_data): allow function invokation
for NULL nodes.
* gtk/gtkwidget.h:
* gtk/gtkwidget.c: new function gtk_widget_stop_accelerator to stop
the emission of the "add-accelerator" signal on a widget. this is
usefull to prevent accelerator installation on certain widgets.
* gtk/gtknotebook.c (gtk_notebook_menu_item_create): keep the menu
labels left justified, by setting their alignment. stop accelerator
installation for the menu items, since we use dynamic menus.
Wed Jun 3 06:41:22 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmenufactory.c: adaptions to use the new accel groups. people
should *really* use GtkItemFactory. this is only for preserving source
compatibility where possible, use of GtkMenuFactory is deprecated as of
now.
* gtk/gtkobject.h (gtk_object_class_add_user_signal): new function
to create user signals of type GTK_RUN_NO_RECURSE. don't know why i
missed this possibility when i added gtk_object_class_add_user_signal
in late january.
* gtk/gtkmain.c (gtk_init): ignore subsequent function calls.
Sun May 31 07:31:09 1998 Tim Janik <timj@gtk.org>
* gtk/gtkaccelgroup.h:
* gtk/gtkaccelgroup.c: new implementation of the accelerator concept.
* gtk/gtkaccellabel.h:
* gtk/gtkaccellabel.c: new widget derived from GtkLabel whitch features
display of the accelerators associated with a certain widget.
* gtk/gtkitemfactory.h:
* gtk/gtkitemfactory.c: new widget, item factory with automatic rc
parsing and accelerator handling.
* gtk/gtkmenu.c (gtk_menu_reposition): new function to care for
positioning a menu.
(gtk_menu_map): removed the allocation code.
(gtk_menu_size_allocate): care for redrawing of children and resize
our widget->window correctly.
(gtk_menu_key_press): feature the new accelerator groups.
* gtk/gtkmenuitem.c (gtk_menu_item_size_allocate): reposition the
submenu if neccessary.
* gtk/gtkmenuitem.c:
* gtk/gtkcheckmenuitem.c:
* gtk/gtkradiomenuitem.c: use GtkAccelLabel in the *_new_with_label()
function variants.
* gdk/gdk.c:
(gdk_keyval_from_name):
(gdk_keyval_name): new functions for keyval<->key-name associations.
(gdk_keyval_to_upper):
(gdk_keyval_to_lower):
(gdk_keyval_is_upper):
(gdk_keyval_is_lower): new functions to check/translate keyvalues with
regards to their cases.
Wed May 27 00:48:10 1998 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_class_path): new function to calculate a
widget's class path.
(gtk_widget_path): new function to calculate a widget's name path.
* gtk/gtkrc.c: newly introduced GtkPatternSpec structures to speed up
pattern matching, features reversed pattern matches.
1998-06-07 06:48:56 +00:00
|
|
|
GtkType
|
1998-05-03 22:41:32 +00:00
|
|
|
gtk_button_box_get_type (void)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
fixed an assertment.
Sat Jun 6 06:01:24 1998 Tim Janik <timj@gtk.org>
* gtk/gtksignal.c (gtk_signal_emitv): fixed an assertment.
* gtk/makeenums.awk: a script to generate the GtkEnumValue arrays from,
this should eventually be done by gentypeinfo.el somewhen.
* gtk/gtkenumvalues.c: new generated file to hold GtkEnumValue arrays.
* gtk/gtktypeutils.h: new function gtk_enum_values() to retrive all the
enum values of an enum type.
* gtk/gtk.defs:
* gtk/gtkcurve.h:
* gtk/gtkobject.h:
* gtk/gtkprivate.h:
* gtk/gtkwidget.h:
* gtk/gtkenums.h:
brought enum/flags definitions in sync, added a few more enum
definitions for bindings and pattern matching.
* some more macro and GtkType fixups in various places.
* gdk/gdktypes.h (enum): added a new value GDK_AFTER_MASK, which is used
as a key-release modifier for the binding system.
Fri Jun 5 06:06:06 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmenu.h (struct _GtkMenu): removed GList*children, since it
was a stale list pointer that is already present in GtkMenuShell.
* gtk/gtkmenushell.h (struct _GtkMenuShellClass): added a signal
GtkMenuShell::selection_done which is emitted after the menu shell
poped down again and all possible menu items have been activated.
Thu Jun 4 02:20:42 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmenushell.c (gtk_menu_shell_button_release): flush the x-queue
before activation of the menuitem, so the menu is actually taken off the
screen prior to any menu item activation.
* gtk/gtkctree.c (gtk_ctree_get_row_data): allow function invokation
for NULL nodes.
* gtk/gtkwidget.h:
* gtk/gtkwidget.c: new function gtk_widget_stop_accelerator to stop
the emission of the "add-accelerator" signal on a widget. this is
usefull to prevent accelerator installation on certain widgets.
* gtk/gtknotebook.c (gtk_notebook_menu_item_create): keep the menu
labels left justified, by setting their alignment. stop accelerator
installation for the menu items, since we use dynamic menus.
Wed Jun 3 06:41:22 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmenufactory.c: adaptions to use the new accel groups. people
should *really* use GtkItemFactory. this is only for preserving source
compatibility where possible, use of GtkMenuFactory is deprecated as of
now.
* gtk/gtkobject.h (gtk_object_class_add_user_signal): new function
to create user signals of type GTK_RUN_NO_RECURSE. don't know why i
missed this possibility when i added gtk_object_class_add_user_signal
in late january.
* gtk/gtkmain.c (gtk_init): ignore subsequent function calls.
Sun May 31 07:31:09 1998 Tim Janik <timj@gtk.org>
* gtk/gtkaccelgroup.h:
* gtk/gtkaccelgroup.c: new implementation of the accelerator concept.
* gtk/gtkaccellabel.h:
* gtk/gtkaccellabel.c: new widget derived from GtkLabel whitch features
display of the accelerators associated with a certain widget.
* gtk/gtkitemfactory.h:
* gtk/gtkitemfactory.c: new widget, item factory with automatic rc
parsing and accelerator handling.
* gtk/gtkmenu.c (gtk_menu_reposition): new function to care for
positioning a menu.
(gtk_menu_map): removed the allocation code.
(gtk_menu_size_allocate): care for redrawing of children and resize
our widget->window correctly.
(gtk_menu_key_press): feature the new accelerator groups.
* gtk/gtkmenuitem.c (gtk_menu_item_size_allocate): reposition the
submenu if neccessary.
* gtk/gtkmenuitem.c:
* gtk/gtkcheckmenuitem.c:
* gtk/gtkradiomenuitem.c: use GtkAccelLabel in the *_new_with_label()
function variants.
* gdk/gdk.c:
(gdk_keyval_from_name):
(gdk_keyval_name): new functions for keyval<->key-name associations.
(gdk_keyval_to_upper):
(gdk_keyval_to_lower):
(gdk_keyval_is_upper):
(gdk_keyval_is_lower): new functions to check/translate keyvalues with
regards to their cases.
Wed May 27 00:48:10 1998 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_class_path): new function to calculate a
widget's class path.
(gtk_widget_path): new function to calculate a widget's name path.
* gtk/gtkrc.c: newly introduced GtkPatternSpec structures to speed up
pattern matching, features reversed pattern matches.
1998-06-07 06:48:56 +00:00
|
|
|
static GtkType button_box_type = 0;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
|
|
|
if (!button_box_type)
|
|
|
|
{
|
1998-11-30 19:07:15 +00:00
|
|
|
static const GtkTypeInfo button_box_info =
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
|
|
|
"GtkButtonBox",
|
|
|
|
sizeof (GtkButtonBox),
|
|
|
|
sizeof (GtkButtonBoxClass),
|
|
|
|
(GtkClassInitFunc) gtk_button_box_class_init,
|
|
|
|
(GtkObjectInitFunc) gtk_button_box_init,
|
1998-07-04 15:31:30 +00:00
|
|
|
/* reserved_1 */ NULL,
|
|
|
|
/* reserved_2 */ NULL,
|
1998-06-28 07:46:10 +00:00
|
|
|
(GtkClassInitFunc) NULL,
|
1997-11-24 22:37:52 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
button_box_type = gtk_type_unique (gtk_box_get_type (), &button_box_info);
|
|
|
|
}
|
|
|
|
|
|
|
|
return button_box_type;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_button_box_class_init (GtkButtonBoxClass *class)
|
|
|
|
{
|
|
|
|
GtkWidgetClass *widget_class;
|
2001-05-17 16:22:06 +00:00
|
|
|
GObjectClass *gobject_class;
|
2001-07-06 02:10:32 +00:00
|
|
|
GtkContainerClass *container_class;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
2001-05-17 16:22:06 +00:00
|
|
|
gobject_class = G_OBJECT_CLASS (class);
|
1997-11-24 22:37:52 +00:00
|
|
|
widget_class = (GtkWidgetClass*) class;
|
2001-07-06 02:10:32 +00:00
|
|
|
container_class = (GtkContainerClass*) class;
|
2001-03-07 21:10:44 +00:00
|
|
|
|
2001-05-17 16:22:06 +00:00
|
|
|
gobject_class->set_property = gtk_button_box_set_property;
|
|
|
|
gobject_class->get_property = gtk_button_box_get_property;
|
2001-07-06 02:10:32 +00:00
|
|
|
|
|
|
|
container_class->set_child_property = gtk_button_box_set_child_property;
|
|
|
|
container_class->get_child_property = gtk_button_box_get_child_property;
|
2001-05-17 16:22:06 +00:00
|
|
|
|
2001-03-07 21:10:44 +00:00
|
|
|
/* FIXME we need to override the "spacing" property on GtkBox once
|
|
|
|
* libgobject allows that.
|
|
|
|
*/
|
fix warning
2001-04-27 Havoc Pennington <hp@redhat.com>
* gtk/gtkcombo.c (gtk_combo_popup_button_press): fix warning
* gtk/gtkmessagedialog.c (gtk_message_dialog_init): make messages selectable
* gtk/gtkentry.c (gtk_entry_real_insert_text): don't strip
line/para separators
(gtk_entry_create_layout): set single paragraph mode on the layout
* gtk/gtkbutton.c (gtk_button_new_from_stock): don't put much
spacing between the image and label; instead, inside a button box
the button will get extra space that will go there, but if people
configure button box for 0 chubbiness, then there's no spacing.
* gtk/gtkbbox.c (gtk_button_box_class_init): Make child ipadding
and min/max size style properties, so people can tune their
chubbiness.
* tests/testgtk.c (make_toolbar): remove calls to removed toolbar
functions
* gtk/gtktoolbar.c (gtk_toolbar_class_init): Make space_size,
space_style, and button_relief into style properties, remove
functions for setting them
* gtk/gtkmenu.c (gtk_menu_key_press): handle menu bar accel to pop
it back down
* gtk/gtkoptionmenu.c (gtk_option_menu_get_props): free boxed
types from gtk_widget_style_get
* gtk/gtkmenubar.c (gtk_menu_bar_set_shadow_type): Remove, replace
with a style property.
* gdk/x11/gdkevents-x11.c: namespace the settings
* gtk/gtkmenubar.c: Add F10 accelerator to move between menubars.
* gtk/gtksettings.c (gtk_settings_class_init): remove code with
side effects from inside g_assert(), so that G_DISABLE_ASSERT can
be used. Also, translate doc strings for settings. Also, namespace
the double-click-time property. Also, remove bell properties crap.
2001-04-28 00:12:47 +00:00
|
|
|
|
|
|
|
gtk_widget_class_install_style_property (widget_class,
|
|
|
|
g_param_spec_int ("child_min_width",
|
|
|
|
_("Minimum child width"),
|
|
|
|
_("Minimum width of buttons inside the box"),
|
|
|
|
0,
|
|
|
|
G_MAXINT,
|
|
|
|
DEFAULT_CHILD_MIN_WIDTH,
|
|
|
|
G_PARAM_READABLE));
|
|
|
|
|
|
|
|
gtk_widget_class_install_style_property (widget_class,
|
|
|
|
g_param_spec_int ("child_min_height",
|
|
|
|
_("Minimum child height"),
|
|
|
|
_("Minimum height of buttons inside the box"),
|
|
|
|
0,
|
|
|
|
G_MAXINT,
|
|
|
|
DEFAULT_CHILD_MIN_HEIGHT,
|
|
|
|
G_PARAM_READABLE));
|
|
|
|
|
|
|
|
gtk_widget_class_install_style_property (widget_class,
|
|
|
|
g_param_spec_int ("child_internal_pad_x",
|
|
|
|
_("Child internal width padding"),
|
|
|
|
_("Amount to increase child's size on either side"),
|
|
|
|
0,
|
|
|
|
G_MAXINT,
|
|
|
|
DEFAULT_CHILD_IPAD_X,
|
|
|
|
G_PARAM_READABLE));
|
|
|
|
|
|
|
|
gtk_widget_class_install_style_property (widget_class,
|
|
|
|
g_param_spec_int ("child_internal_pad_y",
|
|
|
|
_("Child internal height padding"),
|
|
|
|
_("Amount to increase child's size on the top and bottom"),
|
|
|
|
0,
|
|
|
|
G_MAXINT,
|
|
|
|
DEFAULT_CHILD_IPAD_Y,
|
|
|
|
G_PARAM_READABLE));
|
2001-05-17 16:22:06 +00:00
|
|
|
g_object_class_install_property (gobject_class,
|
|
|
|
PROP_LAYOUT_STYLE,
|
|
|
|
g_param_spec_enum ("layout_style",
|
|
|
|
_("Layout style"),
|
|
|
|
_("How to layout the buttons in the box. Possible values are default, spread, edge, start and end"),
|
|
|
|
GTK_TYPE_BUTTON_BOX_STYLE,
|
|
|
|
GTK_BUTTONBOX_DEFAULT_STYLE,
|
|
|
|
G_PARAM_READWRITE));
|
2001-07-06 02:10:32 +00:00
|
|
|
|
|
|
|
gtk_container_class_install_child_property (container_class,
|
|
|
|
CHILD_PROP_SECONDARY,
|
|
|
|
g_param_spec_boolean ("secondary",
|
|
|
|
_("Secondary"),
|
|
|
|
_("If TRUE, the child appears in a secondary group of children, suitable for, e.g., help buttons."),
|
|
|
|
FALSE,
|
|
|
|
G_PARAM_READWRITE));
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_button_box_init (GtkButtonBox *button_box)
|
|
|
|
{
|
2001-03-07 21:10:44 +00:00
|
|
|
GTK_BOX (button_box)->spacing = 0;
|
1997-11-24 22:37:52 +00:00
|
|
|
button_box->child_min_width = GTK_BUTTONBOX_DEFAULT;
|
|
|
|
button_box->child_min_height = GTK_BUTTONBOX_DEFAULT;
|
|
|
|
button_box->child_ipad_x = GTK_BUTTONBOX_DEFAULT;
|
|
|
|
button_box->child_ipad_y = GTK_BUTTONBOX_DEFAULT;
|
1998-02-25 18:36:39 +00:00
|
|
|
button_box->layout_style = GTK_BUTTONBOX_DEFAULT_STYLE;
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
2001-05-17 16:22:06 +00:00
|
|
|
static void
|
|
|
|
gtk_button_box_set_property (GObject *object,
|
|
|
|
guint prop_id,
|
|
|
|
const GValue *value,
|
|
|
|
GParamSpec *pspec)
|
|
|
|
{
|
|
|
|
switch (prop_id)
|
|
|
|
{
|
|
|
|
case PROP_LAYOUT_STYLE:
|
|
|
|
gtk_button_box_set_layout (GTK_BUTTON_BOX (object),
|
|
|
|
g_value_get_enum (value));
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_button_box_get_property (GObject *object,
|
|
|
|
guint prop_id,
|
|
|
|
GValue *value,
|
|
|
|
GParamSpec *pspec)
|
|
|
|
{
|
|
|
|
switch (prop_id)
|
|
|
|
{
|
|
|
|
case PROP_LAYOUT_STYLE:
|
|
|
|
g_value_set_enum (value, GTK_BUTTON_BOX (object)->layout_style);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-07-06 02:10:32 +00:00
|
|
|
static void
|
|
|
|
gtk_button_box_set_child_property (GtkContainer *container,
|
|
|
|
GtkWidget *child,
|
|
|
|
guint property_id,
|
|
|
|
const GValue *value,
|
|
|
|
GParamSpec *pspec)
|
|
|
|
{
|
|
|
|
switch (property_id)
|
|
|
|
{
|
|
|
|
case CHILD_PROP_SECONDARY:
|
|
|
|
gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (container), child,
|
|
|
|
g_value_get_boolean (value));
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_button_box_get_child_property (GtkContainer *container,
|
|
|
|
GtkWidget *child,
|
|
|
|
guint property_id,
|
|
|
|
GValue *value,
|
|
|
|
GParamSpec *pspec)
|
|
|
|
{
|
|
|
|
GList *list;
|
|
|
|
GtkBoxChild *child_info = NULL;
|
2001-05-17 16:22:06 +00:00
|
|
|
|
2001-07-06 02:10:32 +00:00
|
|
|
list = GTK_BOX (container)->children;
|
|
|
|
while (list)
|
|
|
|
{
|
|
|
|
child_info = list->data;
|
|
|
|
if (child_info->widget == child)
|
|
|
|
break;
|
|
|
|
|
|
|
|
list = list->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
g_assert (list != NULL);
|
|
|
|
|
|
|
|
switch (property_id)
|
|
|
|
{
|
|
|
|
case CHILD_PROP_SECONDARY:
|
|
|
|
g_value_set_boolean (value, child_info->is_secondary);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2001-05-17 16:22:06 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
/* set per widget values for spacing, child size and child internal padding */
|
|
|
|
|
2001-10-27 00:41:12 +00:00
|
|
|
void
|
|
|
|
gtk_button_box_set_child_size (GtkButtonBox *widget,
|
|
|
|
gint width, gint height)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
|
|
|
widget->child_min_width = width;
|
|
|
|
widget->child_min_height = height;
|
|
|
|
}
|
|
|
|
|
2001-10-27 00:41:12 +00:00
|
|
|
void
|
|
|
|
gtk_button_box_set_child_ipadding (GtkButtonBox *widget,
|
|
|
|
gint ipad_x, gint ipad_y)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
|
|
|
widget->child_ipad_x = ipad_x;
|
|
|
|
widget->child_ipad_y = ipad_y;
|
|
|
|
}
|
|
|
|
|
2001-10-27 00:41:12 +00:00
|
|
|
void
|
|
|
|
gtk_button_box_set_layout (GtkButtonBox *widget,
|
|
|
|
GtkButtonBoxStyle layout_style)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
1998-02-25 18:36:39 +00:00
|
|
|
g_return_if_fail (layout_style >= GTK_BUTTONBOX_DEFAULT_STYLE &&
|
|
|
|
layout_style <= GTK_BUTTONBOX_END);
|
|
|
|
|
2001-05-17 16:22:06 +00:00
|
|
|
if (widget->layout_style != layout_style)
|
|
|
|
{
|
|
|
|
widget->layout_style = layout_style;
|
|
|
|
g_object_notify (G_OBJECT (widget), "layout_style");
|
|
|
|
gtk_widget_queue_resize (GTK_WIDGET (widget));
|
|
|
|
}
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* get per widget values for spacing, child size and child internal padding */
|
|
|
|
|
2001-10-27 00:41:12 +00:00
|
|
|
void
|
|
|
|
gtk_button_box_get_child_size (GtkButtonBox *widget,
|
|
|
|
gint *width, gint *height)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
|
|
|
*width = widget->child_min_width;
|
|
|
|
*height = widget->child_min_height;
|
|
|
|
}
|
|
|
|
|
2001-10-27 00:41:12 +00:00
|
|
|
void
|
|
|
|
gtk_button_box_get_child_ipadding (GtkButtonBox *widget,
|
|
|
|
gint* ipad_x, gint *ipad_y)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
|
|
|
*ipad_x = widget->child_ipad_x;
|
|
|
|
*ipad_y = widget->child_ipad_y;
|
|
|
|
}
|
|
|
|
|
2001-07-06 02:10:32 +00:00
|
|
|
GtkButtonBoxStyle
|
|
|
|
gtk_button_box_get_layout (GtkButtonBox *widget)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
2001-07-06 02:10:32 +00:00
|
|
|
g_return_val_if_fail (GTK_IS_BUTTON_BOX (widget), GTK_BUTTONBOX_SPREAD);
|
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
return widget->layout_style;
|
|
|
|
}
|
|
|
|
|
2001-07-06 02:10:32 +00:00
|
|
|
/**
|
|
|
|
* gtk_button_box_set_child_secondary
|
|
|
|
* @widget: a #GtkButtonBox
|
|
|
|
* @child: a child of @widget
|
|
|
|
* @is_secondary: if %TRUE, the @child appears in a secondary group of the
|
|
|
|
* button box.
|
|
|
|
*
|
|
|
|
* Sets whether @child should appear in a secondary group of children.
|
|
|
|
* A typical use of a secondary child is the help button in a dialog.
|
|
|
|
*
|
|
|
|
* This group appears after the other children if the style
|
|
|
|
* is %GTK_BUTTONBOX_START, %GTK_BUTTONBOX_SPREAD or
|
|
|
|
* %GTK_BUTTONBOX_EDGE, and before the the other children if the style
|
|
|
|
* is %GTK_BUTTONBOX_END. For horizontal button boxes, the definition
|
|
|
|
* of before/after depends on direction of the widget. (See
|
|
|
|
* gtk_widget_set_direction()) If the style is %GTK_BUTTONBOX_START,
|
|
|
|
* or %GTK_BUTTONBOX_START, then the secondary children are aligned at
|
|
|
|
* the other end of the button box from the main children. For the
|
|
|
|
* other styles, they appear immediately next to the main children.
|
|
|
|
**/
|
|
|
|
void
|
|
|
|
gtk_button_box_set_child_secondary (GtkButtonBox *widget,
|
|
|
|
GtkWidget *child,
|
|
|
|
gboolean is_secondary)
|
|
|
|
{
|
|
|
|
GList *list;
|
|
|
|
|
|
|
|
g_return_if_fail (GTK_IS_BUTTON_BOX (widget));
|
|
|
|
g_return_if_fail (GTK_IS_WIDGET (child));
|
|
|
|
g_return_if_fail (child->parent == GTK_WIDGET (widget));
|
1997-11-24 22:37:52 +00:00
|
|
|
|
2001-07-06 02:10:32 +00:00
|
|
|
list = GTK_BOX (widget)->children;
|
|
|
|
while (list)
|
|
|
|
{
|
|
|
|
GtkBoxChild *child_info = list->data;
|
|
|
|
if (child_info->widget == child)
|
|
|
|
{
|
|
|
|
child_info->is_secondary = is_secondary;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
list = list->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
gtk_widget_child_notify (child, "secondary");
|
|
|
|
|
|
|
|
if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (child))
|
|
|
|
gtk_widget_queue_resize (child);
|
|
|
|
}
|
1997-11-24 22:37:52 +00:00
|
|
|
|
|
|
|
/* Ask children how much space they require and round up
|
|
|
|
to match minimum size and internal padding.
|
|
|
|
Returns the size each single child should have. */
|
|
|
|
void
|
2001-03-07 21:10:44 +00:00
|
|
|
_gtk_button_box_child_requisition (GtkWidget *widget,
|
2001-07-06 02:10:32 +00:00
|
|
|
int *nvis_children,
|
|
|
|
int *nvis_secondaries,
|
|
|
|
int *width,
|
|
|
|
int *height)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
|
|
|
GtkButtonBox *bbox;
|
|
|
|
GtkBoxChild *child;
|
|
|
|
GList *children;
|
|
|
|
gint nchildren;
|
2001-07-06 02:10:32 +00:00
|
|
|
gint nsecondaries;
|
1997-11-24 22:37:52 +00:00
|
|
|
gint needed_width;
|
|
|
|
gint needed_height;
|
|
|
|
GtkRequisition child_requisition;
|
|
|
|
gint ipad_w;
|
|
|
|
gint ipad_h;
|
|
|
|
gint width_default;
|
|
|
|
gint height_default;
|
|
|
|
gint ipad_x_default;
|
|
|
|
gint ipad_y_default;
|
|
|
|
|
|
|
|
gint child_min_width;
|
|
|
|
gint child_min_height;
|
|
|
|
gint ipad_x;
|
|
|
|
gint ipad_y;
|
|
|
|
|
|
|
|
g_return_if_fail (GTK_IS_BUTTON_BOX (widget));
|
|
|
|
|
|
|
|
bbox = GTK_BUTTON_BOX (widget);
|
|
|
|
|
fix warning
2001-04-27 Havoc Pennington <hp@redhat.com>
* gtk/gtkcombo.c (gtk_combo_popup_button_press): fix warning
* gtk/gtkmessagedialog.c (gtk_message_dialog_init): make messages selectable
* gtk/gtkentry.c (gtk_entry_real_insert_text): don't strip
line/para separators
(gtk_entry_create_layout): set single paragraph mode on the layout
* gtk/gtkbutton.c (gtk_button_new_from_stock): don't put much
spacing between the image and label; instead, inside a button box
the button will get extra space that will go there, but if people
configure button box for 0 chubbiness, then there's no spacing.
* gtk/gtkbbox.c (gtk_button_box_class_init): Make child ipadding
and min/max size style properties, so people can tune their
chubbiness.
* tests/testgtk.c (make_toolbar): remove calls to removed toolbar
functions
* gtk/gtktoolbar.c (gtk_toolbar_class_init): Make space_size,
space_style, and button_relief into style properties, remove
functions for setting them
* gtk/gtkmenu.c (gtk_menu_key_press): handle menu bar accel to pop
it back down
* gtk/gtkoptionmenu.c (gtk_option_menu_get_props): free boxed
types from gtk_widget_style_get
* gtk/gtkmenubar.c (gtk_menu_bar_set_shadow_type): Remove, replace
with a style property.
* gdk/x11/gdkevents-x11.c: namespace the settings
* gtk/gtkmenubar.c: Add F10 accelerator to move between menubars.
* gtk/gtksettings.c (gtk_settings_class_init): remove code with
side effects from inside g_assert(), so that G_DISABLE_ASSERT can
be used. Also, translate doc strings for settings. Also, namespace
the double-click-time property. Also, remove bell properties crap.
2001-04-28 00:12:47 +00:00
|
|
|
gtk_widget_style_get (widget,
|
|
|
|
"child_min_width",
|
|
|
|
&width_default,
|
|
|
|
"child_min_height",
|
|
|
|
&height_default,
|
|
|
|
"child_internal_pad_x",
|
|
|
|
&ipad_x_default,
|
|
|
|
"child_internal_pad_y",
|
|
|
|
&ipad_y_default, NULL);
|
1997-11-24 22:37:52 +00:00
|
|
|
|
|
|
|
child_min_width = bbox->child_min_width != GTK_BUTTONBOX_DEFAULT
|
|
|
|
? bbox->child_min_width : width_default;
|
|
|
|
child_min_height = bbox->child_min_height !=GTK_BUTTONBOX_DEFAULT
|
|
|
|
? bbox->child_min_height : height_default;
|
|
|
|
ipad_x = bbox->child_ipad_x != GTK_BUTTONBOX_DEFAULT
|
|
|
|
? bbox->child_ipad_x : ipad_x_default;
|
|
|
|
ipad_y = bbox->child_ipad_y != GTK_BUTTONBOX_DEFAULT
|
|
|
|
? bbox->child_ipad_y : ipad_y_default;
|
|
|
|
|
|
|
|
nchildren = 0;
|
2001-07-06 02:10:32 +00:00
|
|
|
nsecondaries = 0;
|
1997-11-24 22:37:52 +00:00
|
|
|
children = GTK_BOX(bbox)->children;
|
|
|
|
needed_width = child_min_width;
|
|
|
|
needed_height = child_min_height;
|
|
|
|
ipad_w = ipad_x * 2;
|
|
|
|
ipad_h = ipad_y * 2;
|
|
|
|
|
|
|
|
while (children)
|
|
|
|
{
|
|
|
|
child = children->data;
|
|
|
|
children = children->next;
|
|
|
|
|
|
|
|
if (GTK_WIDGET_VISIBLE (child->widget))
|
|
|
|
{
|
|
|
|
nchildren += 1;
|
|
|
|
gtk_widget_size_request (child->widget, &child_requisition);
|
2001-07-06 02:10:32 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
if (child_requisition.width + ipad_w > needed_width)
|
2001-07-06 02:10:32 +00:00
|
|
|
needed_width = child_requisition.width + ipad_w;
|
1997-11-24 22:37:52 +00:00
|
|
|
if (child_requisition.height + ipad_h > needed_height)
|
2001-07-06 02:10:32 +00:00
|
|
|
needed_height = child_requisition.height + ipad_h;
|
|
|
|
if (child->is_secondary)
|
|
|
|
nsecondaries++;
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
}
|
2001-07-06 02:10:32 +00:00
|
|
|
|
|
|
|
if (nvis_children)
|
|
|
|
*nvis_children = nchildren;
|
|
|
|
if (nvis_secondaries)
|
|
|
|
*nvis_secondaries = nsecondaries;
|
|
|
|
if (width)
|
|
|
|
*width = needed_width;
|
|
|
|
if (height)
|
|
|
|
*height = needed_height;
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|