fixed undo_selection bug. fixed resync_selection bug.

Thu Apr 15 01:11:24 1999  Lars Hamann  <lars@gtk.org>

	* gtk/gtkctree.c (resync_selection):
	* gtk/gtkclist.c (resync_selection): fixed undo_selection bug.
	* gtk/gtkclist.c (gtk_clist_button_release): fixed resync_selection
 	bug.

9 files changed, 60 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index a95605b67..4ca0ccbc9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Apr 15 01:11:24 1999  Lars Hamann  <lars@gtk.org>
+
+	* gtk/gtkctree.c (resync_selection): 
+	* gtk/gtkclist.c (resync_selection): fixed undo_selection bug.
+	* gtk/gtkclist.c (gtk_clist_button_release): fixed resync_selection
+ 	bug.
+
 Tue Apr 13 17:14:28 CDT 1999 Shawn T. Amundson <amundson@gtk.org>
 
 	* Released GTK+ 1.2.2
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index a95605b67..4ca0ccbc9 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+Thu Apr 15 01:11:24 1999  Lars Hamann  <lars@gtk.org>
+
+	* gtk/gtkctree.c (resync_selection): 
+	* gtk/gtkclist.c (resync_selection): fixed undo_selection bug.
+	* gtk/gtkclist.c (gtk_clist_button_release): fixed resync_selection
+ 	bug.
+
 Tue Apr 13 17:14:28 CDT 1999 Shawn T. Amundson <amundson@gtk.org>
 
 	* Released GTK+ 1.2.2
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a95605b67..4ca0ccbc9 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Thu Apr 15 01:11:24 1999  Lars Hamann  <lars@gtk.org>
+
+	* gtk/gtkctree.c (resync_selection): 
+	* gtk/gtkclist.c (resync_selection): fixed undo_selection bug.
+	* gtk/gtkclist.c (gtk_clist_button_release): fixed resync_selection
+ 	bug.
+
 Tue Apr 13 17:14:28 CDT 1999 Shawn T. Amundson <amundson@gtk.org>
 
 	* Released GTK+ 1.2.2
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index a95605b67..4ca0ccbc9 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Thu Apr 15 01:11:24 1999  Lars Hamann  <lars@gtk.org>
+
+	* gtk/gtkctree.c (resync_selection): 
+	* gtk/gtkclist.c (resync_selection): fixed undo_selection bug.
+	* gtk/gtkclist.c (gtk_clist_button_release): fixed resync_selection
+ 	bug.
+
 Tue Apr 13 17:14:28 CDT 1999 Shawn T. Amundson <amundson@gtk.org>
 
 	* Released GTK+ 1.2.2
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index a95605b67..4ca0ccbc9 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Thu Apr 15 01:11:24 1999  Lars Hamann  <lars@gtk.org>
+
+	* gtk/gtkctree.c (resync_selection): 
+	* gtk/gtkclist.c (resync_selection): fixed undo_selection bug.
+	* gtk/gtkclist.c (gtk_clist_button_release): fixed resync_selection
+ 	bug.
+
 Tue Apr 13 17:14:28 CDT 1999 Shawn T. Amundson <amundson@gtk.org>
 
 	* Released GTK+ 1.2.2
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index a95605b67..4ca0ccbc9 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Thu Apr 15 01:11:24 1999  Lars Hamann  <lars@gtk.org>
+
+	* gtk/gtkctree.c (resync_selection): 
+	* gtk/gtkclist.c (resync_selection): fixed undo_selection bug.
+	* gtk/gtkclist.c (gtk_clist_button_release): fixed resync_selection
+ 	bug.
+
 Tue Apr 13 17:14:28 CDT 1999 Shawn T. Amundson <amundson@gtk.org>
 
 	* Released GTK+ 1.2.2
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index a95605b67..4ca0ccbc9 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Thu Apr 15 01:11:24 1999  Lars Hamann  <lars@gtk.org>
+
+	* gtk/gtkctree.c (resync_selection): 
+	* gtk/gtkclist.c (resync_selection): fixed undo_selection bug.
+	* gtk/gtkclist.c (gtk_clist_button_release): fixed resync_selection
+ 	bug.
+
 Tue Apr 13 17:14:28 CDT 1999 Shawn T. Amundson <amundson@gtk.org>
 
 	* Released GTK+ 1.2.2
diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index 0cbbe7bd3..5c88b0911 100644
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -3866,8 +3866,11 @@ real_undo_selection (GtkCList *clist)
 		     GPOINTER_TO_INT (work->data), -1, NULL);
 
   for (work = clist->undo_unselection; work; work = work->next)
-    gtk_signal_emit (GTK_OBJECT (clist), clist_signals[UNSELECT_ROW], 
-		     GPOINTER_TO_INT (work->data), -1, NULL);
+    {
+      g_print ("unselect %d\n",GPOINTER_TO_INT (work->data));
+      gtk_signal_emit (GTK_OBJECT (clist), clist_signals[UNSELECT_ROW], 
+		       GPOINTER_TO_INT (work->data), -1, NULL);
+    }
 
   if (GTK_WIDGET_HAS_FOCUS(clist) && clist->focus_row != clist->undo_anchor)
     {
@@ -4023,9 +4026,9 @@ resync_selection (GtkCList *clist,
 	      }
 	  }
     }
-
-  for (list = g_list_reverse (clist->undo_unselection); list;
-       list = list->next)
+  
+  clist->undo_unselection = g_list_reverse (clist->undo_unselection);
+  for (list = clist->undo_unselection; list; list = list->next)
     gtk_signal_emit (GTK_OBJECT (clist), clist_signals[SELECT_ROW],
 		     GPOINTER_TO_INT (list->data), -1, event);
 
@@ -5156,6 +5159,7 @@ gtk_clist_button_release (GtkWidget      *widget,
 	    {
 	    case GTK_SELECTION_EXTENDED:
 	      if (!(event->state & GDK_SHIFT_MASK) ||
+		  !GTK_WIDGET_CAN_FOCUS (widget) ||
 		  event->x < 0 || event->x >= clist->clist_window_width ||
 		  event->y < 0 || event->y >= clist->clist_window_height)
 		GTK_CLIST_CLASS_FW (clist)->resync_selection
diff --git a/gtk/gtkctree.c b/gtk/gtkctree.c
index 007913a37..4f4981c85 100644
--- a/gtk/gtkctree.c
+++ b/gtk/gtkctree.c
@@ -5712,8 +5712,8 @@ resync_selection (GtkCList *clist, GdkEvent *event)
 	  }
     }
 
-  for (list = g_list_reverse (clist->undo_unselection); list;
-       list = list->next)
+  clist->undo_unselection = g_list_reverse (clist->undo_unselection);
+  for (list = clist->undo_unselection; list; list = list->next)
     gtk_ctree_select (ctree, list->data);
 
   clist->anchor = -1;