Removed some GTK_WIDGET_DRAWABLE() tests - we need to update the value

Mon Jan 25 17:48:03 1999  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkcolorsel.c: Removed some GTK_WIDGET_DRAWABLE()
	tests - we need to update the value bar's contents
	even when the widget is unmapped.

diff --git a/ChangeLog b/ChangeLog
index cb81f56ea55872d00473ad462bef1d3c24809ea7..7d2ef736287b169bcfb9dbbe7bfcbc931471523c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jan 25 17:48:03 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <otaylor@redhat.com>
 
        * acinclude.m4 (ac_result): Don't define ENABLE_NLS

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index cb81f56ea55872d00473ad462bef1d3c24809ea7..7d2ef736287b169bcfb9dbbe7bfcbc931471523c 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Mon Jan 25 17:48:03 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <otaylor@redhat.com>
 
        * acinclude.m4 (ac_result): Don't define ENABLE_NLS

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index cb81f56ea55872d00473ad462bef1d3c24809ea7..7d2ef736287b169bcfb9dbbe7bfcbc931471523c 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Mon Jan 25 17:48:03 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <otaylor@redhat.com>
 
        * acinclude.m4 (ac_result): Don't define ENABLE_NLS

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index cb81f56ea55872d00473ad462bef1d3c24809ea7..7d2ef736287b169bcfb9dbbe7bfcbc931471523c 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Mon Jan 25 17:48:03 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <otaylor@redhat.com>
 
        * acinclude.m4 (ac_result): Don't define ENABLE_NLS

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index cb81f56ea55872d00473ad462bef1d3c24809ea7..7d2ef736287b169bcfb9dbbe7bfcbc931471523c 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Mon Jan 25 17:48:03 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <otaylor@redhat.com>
 
        * acinclude.m4 (ac_result): Don't define ENABLE_NLS

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index cb81f56ea55872d00473ad462bef1d3c24809ea7..7d2ef736287b169bcfb9dbbe7bfcbc931471523c 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Mon Jan 25 17:48:03 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <otaylor@redhat.com>
 
        * acinclude.m4 (ac_result): Don't define ENABLE_NLS

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index cb81f56ea55872d00473ad462bef1d3c24809ea7..7d2ef736287b169bcfb9dbbe7bfcbc931471523c 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Mon Jan 25 17:48:03 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <otaylor@redhat.com>
 
        * acinclude.m4 (ac_result): Don't define ENABLE_NLS

diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c
index 5c031d1ebfee4afa23455f9c426a5d8376849837..540aafa4df2bda97e030e557a212e846a80860c8 100644 (file)
--- 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