diff options
| author | Owen Taylor <owt1@cornell.edu> | 1998-02-25 18:36:39 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 1998-02-25 18:36:39 +0000 |
| commit | 777159913ba66a7cfa16c5e4c8bde95fd5660796 (patch) | |
| tree | cc6e2b972bfae267d6e7399fe769dba8d43c58b4 /gtk/gtkvbbox.c | |
| parent | 97bbc97bb2ac6ae012d909c4de9fd9d479d1a40b (diff) | |
| download | gdk-pixbuf-777159913ba66a7cfa16c5e4c8bde95fd5660796.tar.gz | |
Move layout constants into an enumeration, split GTK_BUTTONBOX_DEFAULT
Wed Feb 25 13:18:53 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkbbox.[ch] gtk/gtkhbox.[ch] gtk/gtkvbox.[ch] :
Move layout constants into an enumeration, split
GTK_BUTTONBOX_DEFAULT into GTK_BUTTONBOX_DEFAULT
and GTK_BUTTONBOX_DEFAULT_STYLE (enumeration member).
* gtk/gtkclist.c:
Renamed gtk_clist_row_isvisable to .._is_visible
From: Maciej Stachowiak <mstachow@mit.edu>
Diffstat (limited to 'gtk/gtkvbbox.c')
| -rw-r--r-- | gtk/gtkvbbox.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/gtk/gtkvbbox.c b/gtk/gtkvbbox.c index 3210f82dc..98351604f 100644 --- a/gtk/gtkvbbox.c +++ b/gtk/gtkvbbox.c @@ -26,7 +26,7 @@ static void gtk_vbutton_box_size_allocate (GtkWidget *widget, GtkAllocation *allocation); static gint default_spacing = 10; -static gint default_layout_style = GTK_BUTTONBOX_EDGE; +static GtkButtonBoxStyle default_layout_style = GTK_BUTTONBOX_EDGE; guint gtk_vbutton_box_get_type () @@ -90,8 +90,11 @@ void gtk_vbutton_box_set_spacing_default (gint spacing) /* set default value for layout style */ -void gtk_vbutton_box_set_layout_default (gint layout) +void gtk_vbutton_box_set_layout_default (GtkButtonBoxStyle layout) { + g_return_if_fail (layout >= GTK_BUTTONBOX_DEFAULT_STYLE && + layout <= GTK_BUTTONBOX_END); + default_layout_style = layout; } @@ -106,14 +109,14 @@ gint gtk_vbutton_box_get_spacing_default (void) /* get default value for layout style */ -gint gtk_vbutton_box_get_layout_default (void) +GtkButtonBoxStyle gtk_vbutton_box_get_layout_default (void) { return default_layout_style; } - + static void gtk_vbutton_box_size_request (GtkWidget *widget, GtkRequisition *requisition) @@ -124,7 +127,7 @@ gtk_vbutton_box_size_request (GtkWidget *widget, gint child_width; gint child_height; gint spacing; - gint layout; + GtkButtonBoxStyle layout; g_return_if_fail (widget != NULL); g_return_if_fail (GTK_IS_VBUTTON_BOX (widget)); @@ -135,7 +138,7 @@ gtk_vbutton_box_size_request (GtkWidget *widget, spacing = bbox->spacing != GTK_BUTTONBOX_DEFAULT ? bbox->spacing : default_spacing; - layout = bbox->layout_style != GTK_BUTTONBOX_DEFAULT + layout = bbox->layout_style != GTK_BUTTONBOX_DEFAULT_STYLE ? bbox->layout_style : default_layout_style; gtk_button_box_child_requisition (widget, @@ -193,7 +196,7 @@ gtk_vbutton_box_size_allocate (GtkWidget *widget, gint height; gint childspace; gint childspacing = 0; - gint layout; + GtkButtonBoxStyle layout; gint spacing; g_return_if_fail (widget != NULL); @@ -204,7 +207,7 @@ gtk_vbutton_box_size_allocate (GtkWidget *widget, hbox = GTK_VBUTTON_BOX (widget); spacing = box->spacing != GTK_BUTTONBOX_DEFAULT ? box->spacing : default_spacing; - layout = box->layout_style != GTK_BUTTONBOX_DEFAULT + layout = box->layout_style != GTK_BUTTONBOX_DEFAULT_STYLE ? box->layout_style : default_layout_style; gtk_button_box_child_requisition (widget, &nvis_children, |