Don't allow insensitive widgets to have a grab.

Mon Feb  5 12:47:09 2001  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkwidget.c (gtk_widget_propagate_state)
	  gtk/gtkmain.c (gtk_grab_add): Don't allow insensitive widgets to
	have a grab.

9 files changed, 47 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 89069b448..f979efb30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Feb  5 12:47:09 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkwidget.c (gtk_widget_propagate_state)
+	  gtk/gtkmain.c (gtk_grab_add): Don't allow insensitive widgets to
+	have a grab.
+
 2001-02-10  Ian Peters  <itp@ximian.com>
 
 	* gtk/gtkprogressbar.c (gtk_progress_bar_size_request): use the
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 89069b448..f979efb30 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Mon Feb  5 12:47:09 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkwidget.c (gtk_widget_propagate_state)
+	  gtk/gtkmain.c (gtk_grab_add): Don't allow insensitive widgets to
+	have a grab.
+
 2001-02-10  Ian Peters  <itp@ximian.com>
 
 	* gtk/gtkprogressbar.c (gtk_progress_bar_size_request): use the
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 89069b448..f979efb30 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Mon Feb  5 12:47:09 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkwidget.c (gtk_widget_propagate_state)
+	  gtk/gtkmain.c (gtk_grab_add): Don't allow insensitive widgets to
+	have a grab.
+
 2001-02-10  Ian Peters  <itp@ximian.com>
 
 	* gtk/gtkprogressbar.c (gtk_progress_bar_size_request): use the
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 89069b448..f979efb30 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Mon Feb  5 12:47:09 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkwidget.c (gtk_widget_propagate_state)
+	  gtk/gtkmain.c (gtk_grab_add): Don't allow insensitive widgets to
+	have a grab.
+
 2001-02-10  Ian Peters  <itp@ximian.com>
 
 	* gtk/gtkprogressbar.c (gtk_progress_bar_size_request): use the
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 89069b448..f979efb30 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Mon Feb  5 12:47:09 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkwidget.c (gtk_widget_propagate_state)
+	  gtk/gtkmain.c (gtk_grab_add): Don't allow insensitive widgets to
+	have a grab.
+
 2001-02-10  Ian Peters  <itp@ximian.com>
 
 	* gtk/gtkprogressbar.c (gtk_progress_bar_size_request): use the
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 89069b448..f979efb30 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Mon Feb  5 12:47:09 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkwidget.c (gtk_widget_propagate_state)
+	  gtk/gtkmain.c (gtk_grab_add): Don't allow insensitive widgets to
+	have a grab.
+
 2001-02-10  Ian Peters  <itp@ximian.com>
 
 	* gtk/gtkprogressbar.c (gtk_progress_bar_size_request): use the
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 89069b448..f979efb30 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Mon Feb  5 12:47:09 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkwidget.c (gtk_widget_propagate_state)
+	  gtk/gtkmain.c (gtk_grab_add): Don't allow insensitive widgets to
+	have a grab.
+
 2001-02-10  Ian Peters  <itp@ximian.com>
 
 	* gtk/gtkprogressbar.c (gtk_progress_bar_size_request): use the
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index c31f5e310..e03d5a5ee 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -823,7 +823,7 @@ gtk_grab_add (GtkWidget *widget)
 {
   g_return_if_fail (widget != NULL);
   
-  if (!GTK_WIDGET_HAS_GRAB (widget))
+  if (!GTK_WIDGET_HAS_GRAB (widget) && GTK_WIDGET_IS_SENSITIVE (widget))
     {
       GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_GRAB);
       
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 430adf1a2..30ba745a0 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -4681,9 +4681,12 @@ gtk_widget_propagate_state (GtkWidget           *widget,
 
   if (old_state != GTK_WIDGET_STATE (widget))
     {
+      if (!GTK_WIDGET_IS_SENSITIVE (widget) && GTK_HAS_GRAB (widget))
+	gtk_grab_remove (widget);
+      
       gtk_widget_ref (widget);
       gtk_signal_emit (GTK_OBJECT (widget), widget_signals[STATE_CHANGED], old_state);
-      
+
       if (GTK_IS_CONTAINER (widget))
 	{
 	  data->parent_sensitive = (GTK_WIDGET_IS_SENSITIVE (widget) != FALSE);