From 08f1e8098f088527be4539fd9ca49b72e80df99f Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Mon, 25 Jan 1999 22:43:50 +0000 Subject: [PATCH] Removed some GTK_WIDGET_DRAWABLE() tests - we need to update the value Mon Jan 25 17:48:03 1999 Owen Taylor * gtk/gtkcolorsel.c: Removed some GTK_WIDGET_DRAWABLE() tests - we need to update the value bar's contents even when the widget is unmapped. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkcolorsel.c | 12 +++++------- 8 files changed, 47 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index cb81f56ea5..7d2ef73628 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Jan 25 17:48:03 1999 Owen Taylor + + * gtk/gtkcolorsel.c: Removed some GTK_WIDGET_DRAWABLE() + tests - we need to update the value bar's contents + even when the widget is unmapped. + Mon Jan 25 15:47:46 1999 Owen Taylor * acinclude.m4 (ac_result): Don't define ENABLE_NLS diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index cb81f56ea5..7d2ef73628 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Mon Jan 25 17:48:03 1999 Owen Taylor + + * gtk/gtkcolorsel.c: Removed some GTK_WIDGET_DRAWABLE() + tests - we need to update the value bar's contents + even when the widget is unmapped. + Mon Jan 25 15:47:46 1999 Owen Taylor * acinclude.m4 (ac_result): Don't define ENABLE_NLS diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index cb81f56ea5..7d2ef73628 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Mon Jan 25 17:48:03 1999 Owen Taylor + + * gtk/gtkcolorsel.c: Removed some GTK_WIDGET_DRAWABLE() + tests - we need to update the value bar's contents + even when the widget is unmapped. + Mon Jan 25 15:47:46 1999 Owen Taylor * acinclude.m4 (ac_result): Don't define ENABLE_NLS diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index cb81f56ea5..7d2ef73628 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Mon Jan 25 17:48:03 1999 Owen Taylor + + * gtk/gtkcolorsel.c: Removed some GTK_WIDGET_DRAWABLE() + tests - we need to update the value bar's contents + even when the widget is unmapped. + Mon Jan 25 15:47:46 1999 Owen Taylor * acinclude.m4 (ac_result): Don't define ENABLE_NLS diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index cb81f56ea5..7d2ef73628 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Mon Jan 25 17:48:03 1999 Owen Taylor + + * gtk/gtkcolorsel.c: Removed some GTK_WIDGET_DRAWABLE() + tests - we need to update the value bar's contents + even when the widget is unmapped. + Mon Jan 25 15:47:46 1999 Owen Taylor * acinclude.m4 (ac_result): Don't define ENABLE_NLS diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index cb81f56ea5..7d2ef73628 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Mon Jan 25 17:48:03 1999 Owen Taylor + + * gtk/gtkcolorsel.c: Removed some GTK_WIDGET_DRAWABLE() + tests - we need to update the value bar's contents + even when the widget is unmapped. + Mon Jan 25 15:47:46 1999 Owen Taylor * acinclude.m4 (ac_result): Don't define ENABLE_NLS diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index cb81f56ea5..7d2ef73628 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Mon Jan 25 17:48:03 1999 Owen Taylor + + * gtk/gtkcolorsel.c: Removed some GTK_WIDGET_DRAWABLE() + tests - we need to update the value bar's contents + even when the widget is unmapped. + Mon Jan 25 15:47:46 1999 Owen Taylor * acinclude.m4 (ac_result): Don't define ENABLE_NLS diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c index 5c031d1ebf..540aafa4df 100644 --- a/gtk/gtkcolorsel.c +++ b/gtk/gtkcolorsel.c @@ -490,12 +490,11 @@ gtk_color_selection_set_color (GtkColorSelection *colorsel, gtk_color_selection_update_inputs (colorsel, RGB_INPUTS | HSV_INPUTS | OPACITY_INPUTS, BOTH); + gtk_color_selection_draw_value_bar (colorsel, FALSE); + gtk_color_selection_draw_sample (colorsel, FALSE); + if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (colorsel))) - { - gtk_color_selection_draw_value_bar (colorsel, FALSE); - gtk_color_selection_draw_sample (colorsel, FALSE); - gtk_color_selection_draw_wheel_marker (colorsel); - } + gtk_color_selection_draw_wheel_marker (colorsel); } void @@ -819,8 +818,7 @@ gtk_color_selection_set_opacity (GtkColorSelection *colorsel, gtk_widget_show (colorsel->entries[OPACITY]); } - if (GTK_WIDGET_DRAWABLE (colorsel->sample_area)) - gtk_color_selection_draw_sample (colorsel, FALSE); + gtk_color_selection_draw_sample (colorsel, FALSE); } static void