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/gtkhbbox.c | |
| parent | 97bbc97bb2ac6ae012d909c4de9fd9d479d1a40b (diff) | |
| download | gtk+-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/gtkhbbox.c')
| -rw-r--r-- | gtk/gtkhbbox.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/gtk/gtkhbbox.c b/gtk/gtkhbbox.c index 40efc51afe..4fde1b64d6 100644 --- a/gtk/gtkhbbox.c +++ b/gtk/gtkhbbox.c @@ -91,8 +91,11 @@ void gtk_hbutton_box_set_spacing_default (gint spacing) /* set default value for layout style */ -void gtk_hbutton_box_set_layout_default (gint layout) +void gtk_hbutton_box_set_layout_default (GtkButtonBoxStyle layout) { + g_return_if_fail (layout >= GTK_BUTTONBOX_DEFAULT_STYLE && + layout <= GTK_BUTTONBOX_END); + default_layout_style = layout; } @@ -106,7 +109,7 @@ gint gtk_hbutton_box_get_spacing_default (void) /* get default value for layout style */ -gint gtk_hbutton_box_get_layout_default (void) +GtkButtonBoxStyle gtk_hbutton_box_get_layout_default (void) { return default_layout_style; } @@ -123,7 +126,7 @@ gtk_hbutton_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_HBUTTON_BOX (widget)); @@ -134,7 +137,7 @@ gtk_hbutton_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, @@ -191,7 +194,7 @@ gtk_hbutton_box_size_allocate (GtkWidget *widget, gint width; gint childspace; gint childspacing = 0; - gint layout; + GtkButtonBoxStyle layout; gint spacing; g_return_if_fail (widget != NULL); @@ -202,7 +205,7 @@ gtk_hbutton_box_size_allocate (GtkWidget *widget, hbox = GTK_HBUTTON_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, |