diff options
author | Havoc Pennington <hp@redhat.com> | 2001-03-07 21:10:44 +0000 |
---|---|---|
committer | Havoc Pennington <hp@src.gnome.org> | 2001-03-07 21:10:44 +0000 |
commit | 9d1e2a13231fd894a5b7a0ee5a95035af6f55745 (patch) | |
tree | 19e4394033514eb94c7875eb3aca9fec606bcc3a /gtk/gtkbbox.c | |
parent | 3beaeae49f22e90cb5672c456f635152a9d720dc (diff) | |
download | gtk+-9d1e2a13231fd894a5b7a0ee5a95035af6f55745.tar.gz |
new function, turns off decorations for a window.
2001-03-07 Havoc Pennington <hp@redhat.com>
* gtk/gtkwindow.c (gtk_window_set_decorated): new function, turns
off decorations for a window.
* demos/gtk-demo/button_box.c (create_bbox): adapt to button box
changes
* gtk/gtklabel.c (gtk_label_get_layout_offsets): new function
to get location of PangoLayout inside the label, closes #51198
* gtk/testgtk.c (create_bbox): fix up button box usage
* gtk/testcalendar.c (create_calendar): fix up button box usage
* gtk/gtkfilesel.c (gtk_file_selection_init): fixup buttonbox usage
* gtk/gtkdialog.c (gtk_dialog_init): fixup buttonbox usage
* gtk/gtkhbbox.h: deprecations
* gtk/gtkvbbox.h: deprecations
* gtk/gtkbox.c (gtk_box_get_spacing): new function, used to
emulate deprecated gtk_button_box_get_spacing
* gtk/gtkbbox.h: deprecate some useless functions, remove entirely
the "set global default" functions
(struct _GtkButtonBox): remove "spacing" field, use the one from
GtkBox base class
* gtk/gtkbbox.c (_gtk_button_box_child_requisition): rename with uscore
* gtk/gtkiconfactory.c (gtk_icon_set_render_icon): If we fail to
render the icon, return the missing image icon.
* gtk/gtkimage.c (gtk_image_set_from_file): fall back to missing
image icon if the load fails.
* gtk/gtkstock.h (GTK_STOCK_MISSING_IMAGE): Add stock icon for use
when no image is found; should be the Netscape "missing image"
icon eventually but for now is a random image
* gtk/gtkwindow.c (gtk_window_set_role): new function, sets the
role for the session manager
* gtk/testgtk.c (dnd_drop): remove use of GTK_WINDOW_DIALOG
* gtk/gtkcompat.h (GTK_WINDOW_DIALOG): compat #define
GTK_WINDOW_DIALOG GTK_WINDOW_TOPLEVEL
* gtk/gtkenums.h (enum GtkWindowType): remove GTK_WINDOW_DIALOG
Diffstat (limited to 'gtk/gtkbbox.c')
-rw-r--r-- | gtk/gtkbbox.c | 60 |
1 files changed, 13 insertions, 47 deletions
diff --git a/gtk/gtkbbox.c b/gtk/gtkbbox.c index 5ee3b86d00..45fe3d3453 100644 --- a/gtk/gtkbbox.c +++ b/gtk/gtkbbox.c @@ -68,12 +68,16 @@ gtk_button_box_class_init (GtkButtonBoxClass *class) GtkWidgetClass *widget_class; widget_class = (GtkWidgetClass*) class; + + /* FIXME we need to override the "spacing" property on GtkBox once + * libgobject allows that. + */ } static void gtk_button_box_init (GtkButtonBox *button_box) { - button_box->spacing = GTK_BUTTONBOX_DEFAULT; + GTK_BOX (button_box)->spacing = 0; button_box->child_min_width = GTK_BUTTONBOX_DEFAULT; button_box->child_min_height = GTK_BUTTONBOX_DEFAULT; button_box->child_ipad_x = GTK_BUTTONBOX_DEFAULT; @@ -81,43 +85,8 @@ gtk_button_box_init (GtkButtonBox *button_box) button_box->layout_style = GTK_BUTTONBOX_DEFAULT_STYLE; } - -/* set default values for child size and child internal padding */ -/* default spacing is in defined in subclasses */ - -void gtk_button_box_set_child_size_default (gint width, gint height) -{ - default_child_min_width = width; - default_child_min_height = height; -} - -void gtk_button_box_set_child_ipadding_default (gint ipad_x, gint ipad_y) -{ - default_child_ipad_x = ipad_x; - default_child_ipad_y = ipad_y; -} - -/* get default values for child size and child internal padding */ - -void gtk_button_box_get_child_size_default (gint *width, gint *height) -{ - *width = default_child_min_width; - *height = default_child_min_height; -} - -void gtk_button_box_get_child_ipadding_default (gint *ipad_x, gint *ipad_y) -{ - *ipad_x = default_child_ipad_x; - *ipad_y = default_child_ipad_y; -} - /* set per widget values for spacing, child size and child internal padding */ -void gtk_button_box_set_spacing (GtkButtonBox *widget, gint spacing) -{ - widget->spacing = spacing; -} - void gtk_button_box_set_child_size (GtkButtonBox *widget, gint width, gint height) { widget->child_min_width = width; @@ -143,11 +112,6 @@ void gtk_button_box_set_layout (GtkButtonBox *widget, /* get per widget values for spacing, child size and child internal padding */ -gint gtk_button_box_get_spacing (GtkButtonBox *widget) -{ - return widget->spacing; -} - void gtk_button_box_get_child_size (GtkButtonBox *widget, gint *width, gint *height) { @@ -173,10 +137,10 @@ GtkButtonBoxStyle gtk_button_box_get_layout (GtkButtonBox *widget) to match minimum size and internal padding. Returns the size each single child should have. */ void -gtk_button_box_child_requisition (GtkWidget *widget, - int *nvis_children, - int *width, - int *height) +_gtk_button_box_child_requisition (GtkWidget *widget, + int *nvis_children, + int *width, + int *height) { GtkButtonBox *bbox; GtkBoxChild *child; @@ -202,8 +166,10 @@ gtk_button_box_child_requisition (GtkWidget *widget, bbox = GTK_BUTTON_BOX (widget); - gtk_button_box_get_child_size_default (&width_default, &height_default); - gtk_button_box_get_child_ipadding_default (&ipad_x_default, &ipad_y_default); + width_default = default_child_min_width; + height_default = default_child_min_height; + ipad_x_default = default_child_ipad_x; + ipad_y_default = default_child_ipad_y; child_min_width = bbox->child_min_width != GTK_BUTTONBOX_DEFAULT ? bbox->child_min_width : width_default; |