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/gtkvbbox.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/gtkvbbox.c')
| -rw-r--r-- | gtk/gtkvbbox.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/gtk/gtkvbbox.c b/gtk/gtkvbbox.c index b199d1d448..d427d2917a 100644 --- a/gtk/gtkvbbox.c +++ b/gtk/gtkvbbox.c @@ -146,15 +146,14 @@ gtk_vbutton_box_size_request (GtkWidget *widget, box = GTK_BOX (widget); bbox = GTK_BUTTON_BOX (widget); - spacing = bbox->spacing != GTK_BUTTONBOX_DEFAULT - ? bbox->spacing : default_spacing; + spacing = box->spacing; layout = bbox->layout_style != GTK_BUTTONBOX_DEFAULT_STYLE ? bbox->layout_style : default_layout_style; - gtk_button_box_child_requisition (widget, - &nvis_children, - &child_width, - &child_height); + _gtk_button_box_child_requisition (widget, + &nvis_children, + &child_width, + &child_height); if (nvis_children == 0) { @@ -193,6 +192,7 @@ static void gtk_vbutton_box_size_allocate (GtkWidget *widget, GtkAllocation *allocation) { + GtkBox *base_box; GtkButtonBox *box; GtkVButtonBox *hbox; GtkBoxChild *child; @@ -213,16 +213,16 @@ gtk_vbutton_box_size_allocate (GtkWidget *widget, g_return_if_fail (GTK_IS_VBUTTON_BOX (widget)); g_return_if_fail (allocation != NULL); + base_box = GTK_BOX (widget); box = GTK_BUTTON_BOX (widget); hbox = GTK_VBUTTON_BOX (widget); - spacing = box->spacing != GTK_BUTTONBOX_DEFAULT - ? box->spacing : default_spacing; + spacing = base_box->spacing; layout = box->layout_style != GTK_BUTTONBOX_DEFAULT_STYLE ? box->layout_style : default_layout_style; - gtk_button_box_child_requisition (widget, - &nvis_children, - &child_width, - &child_height); + _gtk_button_box_child_requisition (widget, + &nvis_children, + &child_width, + &child_height); widget->allocation = *allocation; height = allocation->height - GTK_CONTAINER (box)->border_width*2; switch (layout) |