Don't force a clear until the widget is actually on screen.

Sun May  3 19:04:46 1998  Owen Taylor  <otaylor@gtk.org>

	* gtk/gtklabel.c (gtk_label_state_changed): Don't
	force a clear until the widget is actually on
	screen.

8 files changed, 46 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index b7f9431c4..6c16d3db1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun May  3 19:04:46 1998  Owen Taylor  <otaylor@gtk.org>
+
+	* gtk/gtklabel.c (gtk_label_state_changed): Don't
+	force a clear until the widget is actually on
+	screen.
+
 Sun May  3 17:20:50 1998  Owen Taylor  <otaylor@gtk.org>
 
 	* configure.in acheader.h gdk/gdkwindow.c 
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index b7f9431c4..6c16d3db1 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Sun May  3 19:04:46 1998  Owen Taylor  <otaylor@gtk.org>
+
+	* gtk/gtklabel.c (gtk_label_state_changed): Don't
+	force a clear until the widget is actually on
+	screen.
+
 Sun May  3 17:20:50 1998  Owen Taylor  <otaylor@gtk.org>
 
 	* configure.in acheader.h gdk/gdkwindow.c 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b7f9431c4..6c16d3db1 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Sun May  3 19:04:46 1998  Owen Taylor  <otaylor@gtk.org>
+
+	* gtk/gtklabel.c (gtk_label_state_changed): Don't
+	force a clear until the widget is actually on
+	screen.
+
 Sun May  3 17:20:50 1998  Owen Taylor  <otaylor@gtk.org>
 
 	* configure.in acheader.h gdk/gdkwindow.c 
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index b7f9431c4..6c16d3db1 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Sun May  3 19:04:46 1998  Owen Taylor  <otaylor@gtk.org>
+
+	* gtk/gtklabel.c (gtk_label_state_changed): Don't
+	force a clear until the widget is actually on
+	screen.
+
 Sun May  3 17:20:50 1998  Owen Taylor  <otaylor@gtk.org>
 
 	* configure.in acheader.h gdk/gdkwindow.c 
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index b7f9431c4..6c16d3db1 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Sun May  3 19:04:46 1998  Owen Taylor  <otaylor@gtk.org>
+
+	* gtk/gtklabel.c (gtk_label_state_changed): Don't
+	force a clear until the widget is actually on
+	screen.
+
 Sun May  3 17:20:50 1998  Owen Taylor  <otaylor@gtk.org>
 
 	* configure.in acheader.h gdk/gdkwindow.c 
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b7f9431c4..6c16d3db1 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Sun May  3 19:04:46 1998  Owen Taylor  <otaylor@gtk.org>
+
+	* gtk/gtklabel.c (gtk_label_state_changed): Don't
+	force a clear until the widget is actually on
+	screen.
+
 Sun May  3 17:20:50 1998  Owen Taylor  <otaylor@gtk.org>
 
 	* configure.in acheader.h gdk/gdkwindow.c 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b7f9431c4..6c16d3db1 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Sun May  3 19:04:46 1998  Owen Taylor  <otaylor@gtk.org>
+
+	* gtk/gtklabel.c (gtk_label_state_changed): Don't
+	force a clear until the widget is actually on
+	screen.
+
 Sun May  3 17:20:50 1998  Owen Taylor  <otaylor@gtk.org>
 
 	* configure.in acheader.h gdk/gdkwindow.c 
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 7bd3687c7..fa5051d89 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -396,13 +396,15 @@ static void
 gtk_label_state_changed (GtkWidget      *widget,
 			 guint	         previous_state)
 {
-  GTK_LABEL (widget)->needs_clear = 1;
+  if (GTK_WIDGET_DRAWABLE (widget))
+    GTK_LABEL (widget)->needs_clear = 1;
 }
 
 static void 
 gtk_label_style_set	(GtkWidget      *widget,
 			 GtkStyle       *previous_style)
 {
-  GTK_LABEL (widget)->needs_clear = 1;
+  if (GTK_WIDGET_DRAWABLE (widget))
+    GTK_LABEL (widget)->needs_clear = 1;
 }