diff options
| author | Havoc Pennington <hp@redhat.com> | 2001-02-19 22:25:30 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2001-02-19 22:25:30 +0000 |
| commit | f4fa22da5524e90e70a14b9630d810b23d0b520e (patch) | |
| tree | 2118721fb1b3fd3f74e5427315266c1d94dda7cf /gtk/gtkcheckbutton.c | |
| parent | 6fb6363e3013d67e19b9e2b1e5b9d1a3c8f67494 (diff) | |
| download | gtk+-f4fa22da5524e90e70a14b9630d810b23d0b520e.tar.gz | |
test was backward, so deprecated functions were excluded by default
2001-02-19 Havoc Pennington <hp@redhat.com>
* gdk/gdkcolor.h: test was backward, so deprecated functions were
excluded by default
* gtk/gtkstyle.c (gtk_default_draw_diamond): draw etched in/out,
clean up the old code a bit
* gtk/gtkradiobutton.c (gtk_radio_button_draw_indicator): draw
inconsistent state
* gtk/gtkradiomenuitem.c (gtk_radio_menu_item_draw_indicator):
draw inconsistent state
* gtk/testgtk.c (create_toggle_buttons): add test for inconsistent
(create_menu): add inconsistent test
* gtk/gtkcheckmenuitem.c (gtk_check_menu_item_set_inconsistent):
new function
(gtk_check_menu_item_get_inconsistent): new function
(gtk_real_check_menu_item_draw_indicator): draw the inconsistent
state (using etched in for now)
* gtk/gtkcheckbutton.c (gtk_real_check_button_draw_indicator):
draw inconsistent state
* gtk/gtktogglebutton.c (gtk_toggle_button_set_inconsistent): new
function, used when the user has selected a range of stuff in
different states
(gtk_toggle_button_get_inconsistent): accessor for that
(gtk_toggle_button_paint): draw inconsistent state (etched in?
don't know what else to do)
Diffstat (limited to 'gtk/gtkcheckbutton.c')
| -rw-r--r-- | gtk/gtkcheckbutton.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/gtk/gtkcheckbutton.c b/gtk/gtkcheckbutton.c index 681082d7ec..dc92a23c8d 100644 --- a/gtk/gtkcheckbutton.c +++ b/gtk/gtkcheckbutton.c @@ -356,8 +356,13 @@ gtk_real_check_button_draw_indicator (GtkCheckButton *check_button, y = widget->allocation.y + (widget->allocation.height - GTK_CHECK_BUTTON_GET_CLASS (widget)->indicator_size) / 2; width = GTK_CHECK_BUTTON_GET_CLASS (widget)->indicator_size; height = GTK_CHECK_BUTTON_GET_CLASS (widget)->indicator_size; - - if (GTK_TOGGLE_BUTTON (widget)->active) + + if (GTK_TOGGLE_BUTTON (widget)->inconsistent) + { + state_type = GTK_WIDGET_STATE (widget) == GTK_STATE_ACTIVE ? GTK_STATE_NORMAL : GTK_WIDGET_STATE (widget); + shadow_type = GTK_SHADOW_ETCHED_IN; + } + else if (GTK_TOGGLE_BUTTON (widget)->active) { state_type = GTK_STATE_ACTIVE; shadow_type = GTK_SHADOW_IN; |