don't autoselect focus_row in case of GTK_SELECTION_EXTENDED

Fri Feb 12 00:08:01 1999  Lars Hamann  <lars@gtk.org>

        * gtk/gtklist.c (gtk_list_remove_items_internal): don't autoselect
        focus_row in case of GTK_SELECTION_EXTENDED

        * gtk/testgtk.c : few changes in list example.

        * gtk/gtklistitem.c (gtk_list_item_class_init):
        * gtk/gtkctree.c (gtk_ctree_class_init):
        * gtk/gtkclist.c (gtk_clist_class_init):
        fixed indentation, removed unused key bindings

1 files changed, 97 insertions, 197 deletions

diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index b3e6a7aaf2..401614ab8c 100644
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -473,6 +473,7 @@ gtk_clist_class_init (GtkCListClass *klass)
   GtkObjectClass *object_class;
   GtkWidgetClass *widget_class;
   GtkContainerClass *container_class;
+  GtkBindingSet *binding_set;
 
   object_class = (GtkObjectClass *) klass;
   widget_class = (GtkWidgetClass *) klass;
@@ -700,203 +701,102 @@ gtk_clist_class_init (GtkCListClass *klass)
   klass->set_cell_contents = set_cell_contents;
   klass->cell_size_request = cell_size_request;
 
-  {
-    GtkBindingSet *binding_set;
-
-    binding_set = gtk_binding_set_by_class (klass);
-    gtk_binding_entry_add_signal (binding_set, GDK_Up, 0,
-				  "scroll_vertical", 2,
-				  GTK_TYPE_ENUM, GTK_SCROLL_STEP_BACKWARD,
-                                  GTK_TYPE_FLOAT, 0.0);
-    gtk_binding_entry_add_signal (binding_set, GDK_Down, 0,
-				  "scroll_vertical", 2,
-				  GTK_TYPE_ENUM, GTK_SCROLL_STEP_FORWARD,
-                                  GTK_TYPE_FLOAT, 0.0);
-    gtk_binding_entry_add_signal (binding_set, GDK_Page_Up, 0,
-				  "scroll_vertical", 2,
-				  GTK_TYPE_ENUM, GTK_SCROLL_PAGE_BACKWARD,
-                                  GTK_TYPE_FLOAT, 0.0);
-    gtk_binding_entry_add_signal (binding_set, GDK_Page_Down, 0,
-				  "scroll_vertical", 2,
-				  GTK_TYPE_ENUM, GTK_SCROLL_PAGE_FORWARD,
-                                  GTK_TYPE_FLOAT, 0.0);
-    gtk_binding_entry_add_signal (binding_set, GDK_Home, GDK_CONTROL_MASK,
-				  "scroll_vertical", 2,
-				  GTK_TYPE_ENUM, GTK_SCROLL_JUMP,
-                                  GTK_TYPE_FLOAT, 0.0);
-    gtk_binding_entry_add_signal (binding_set, GDK_End, GDK_CONTROL_MASK,
-				  "scroll_vertical", 2,
-				  GTK_TYPE_ENUM, GTK_SCROLL_JUMP,
-                                  GTK_TYPE_FLOAT, 1.0);
-
-    gtk_binding_entry_add_signal (binding_set, GDK_Up, GDK_SHIFT_MASK,
-				  "extend_selection", 3,
-				  GTK_TYPE_ENUM, GTK_SCROLL_STEP_BACKWARD,
-                                  GTK_TYPE_FLOAT, 0.0, GTK_TYPE_BOOL, TRUE);
-    gtk_binding_entry_add_signal (binding_set, GDK_Down, GDK_SHIFT_MASK,
-				  "extend_selection", 3,
-				  GTK_TYPE_ENUM, GTK_SCROLL_STEP_FORWARD,
-                                  GTK_TYPE_FLOAT, 0.0, GTK_TYPE_BOOL, TRUE);
-    gtk_binding_entry_add_signal (binding_set, GDK_Page_Up, GDK_SHIFT_MASK,
-				  "extend_selection", 3,
-				  GTK_TYPE_ENUM, GTK_SCROLL_PAGE_BACKWARD,
-                                  GTK_TYPE_FLOAT, 0.0, GTK_TYPE_BOOL, TRUE);
-    gtk_binding_entry_add_signal (binding_set, GDK_Page_Down, GDK_SHIFT_MASK,
-				  "extend_selection", 3,
-				  GTK_TYPE_ENUM, GTK_SCROLL_PAGE_FORWARD,
-                                  GTK_TYPE_FLOAT, 0.0, GTK_TYPE_BOOL, TRUE);
-    gtk_binding_entry_add_signal (binding_set, GDK_Home,
-				  GDK_SHIFT_MASK | GDK_CONTROL_MASK,
-				  "extend_selection", 3,
-				  GTK_TYPE_ENUM, GTK_SCROLL_JUMP,
-                                  GTK_TYPE_FLOAT, 0.0, GTK_TYPE_BOOL, TRUE);
-    gtk_binding_entry_add_signal (binding_set, GDK_End,
-				  GDK_SHIFT_MASK | GDK_CONTROL_MASK,
-				  "extend_selection", 3,
-				  GTK_TYPE_ENUM, GTK_SCROLL_JUMP,
-                                  GTK_TYPE_FLOAT, 1.0, GTK_TYPE_BOOL, TRUE);
-
-    gtk_binding_entry_add_signal (binding_set, GDK_Left, 0,
-				  "scroll_horizontal", 2,
-				  GTK_TYPE_ENUM, GTK_SCROLL_STEP_BACKWARD,
-                                  GTK_TYPE_FLOAT, 0.0);
-    gtk_binding_entry_add_signal (binding_set, GDK_Right, 0,
-				  "scroll_horizontal", 2,
-				  GTK_TYPE_ENUM, GTK_SCROLL_STEP_FORWARD,
-                                  GTK_TYPE_FLOAT, 0.0);
-    gtk_binding_entry_add_signal (binding_set, GDK_Home, 0,
-				  "scroll_horizontal", 2,
-				  GTK_TYPE_ENUM, GTK_SCROLL_JUMP,
-                                  GTK_TYPE_FLOAT, 0.0);
-    gtk_binding_entry_add_signal (binding_set, GDK_End, 0,
-				  "scroll_horizontal", 2,
-				  GTK_TYPE_ENUM, GTK_SCROLL_JUMP,
-                                  GTK_TYPE_FLOAT, 1.0);
-
-    gtk_binding_entry_add_signal (binding_set, GDK_Escape, 0,
-				  "undo_selection", 0);
-    gtk_binding_entry_add_signal (binding_set, GDK_Escape, 0,
-				  "abort_column_resize", 0);
-    gtk_binding_entry_add_signal (binding_set, GDK_space, 0,
-				  "toggle_focus_row", 0);
-    gtk_binding_entry_add_signal (binding_set, GDK_space, GDK_CONTROL_MASK,
-				  "toggle_add_mode", 0);
-    gtk_binding_entry_add_signal (binding_set, '/', GDK_CONTROL_MASK,
-				  "select_all", 0);
-    gtk_binding_entry_add_signal (binding_set, '\\', GDK_CONTROL_MASK,
-				  "unselect_all", 0);
-    gtk_binding_entry_add_signal (binding_set, GDK_Shift_L,
-				  GDK_RELEASE_MASK | GDK_SHIFT_MASK,
-				  "end_selection", 0);
-    gtk_binding_entry_add_signal (binding_set, GDK_Shift_R,
-				  GDK_RELEASE_MASK | GDK_SHIFT_MASK,
-				  "end_selection", 0);
-    gtk_binding_entry_add_signal (binding_set, GDK_Shift_L,
-				  GDK_RELEASE_MASK | GDK_SHIFT_MASK |
-				  GDK_CONTROL_MASK,
-				  "end_selection", 0);
-    gtk_binding_entry_add_signal (binding_set, GDK_Shift_R,
-				  GDK_RELEASE_MASK | GDK_SHIFT_MASK |
-				  GDK_CONTROL_MASK,
-				  "end_selection", 0);
-  }
-
-  /*
-  {
-    GtkBindingSet *binding_set;
-
-    binding_set = gtk_binding_set_by_class (klass);
-    gtk_binding_entry_add_signal (binding_set, GDK_Up, 0,
-				  "scroll_vertical", 2,
-				  GTK_TYPE_ENUM, GTK_SCROLL_STEP_BACKWARD,
-                                  GTK_TYPE_FLOAT, 0.0);
-    gtk_binding_entry_add_signal (binding_set, GDK_Down, 0,
-				  "scroll_vertical", 2,
-				  GTK_TYPE_ENUM, GTK_SCROLL_STEP_FORWARD,
-                                  GTK_TYPE_FLOAT, 0.0);
-    gtk_binding_entry_add_signal (binding_set, GDK_Page_Up, 0,
-				  "scroll_vertical", 2,
-				  GTK_TYPE_ENUM, GTK_SCROLL_PAGE_BACKWARD,
-                                  GTK_TYPE_FLOAT, 0.0);
-    gtk_binding_entry_add_signal (binding_set, GDK_Page_Down, 0,
-				  "scroll_vertical", 2,
-				  GTK_TYPE_ENUM, GTK_SCROLL_PAGE_FORWARD,
-                                  GTK_TYPE_FLOAT, 0.0);
-    gtk_binding_entry_add_signal (binding_set, GDK_Home, GDK_CONTROL_MASK,
-				  "scroll_vertical", 2,
-				  GTK_TYPE_ENUM, GTK_SCROLL_JUMP,
-                                  GTK_TYPE_FLOAT, 0.0);
-    gtk_binding_entry_add_signal (binding_set, GDK_End, GDK_CONTROL_MASK,
-				  "scroll_vertical", 2,
-				  GTK_TYPE_ENUM, GTK_SCROLL_JUMP,
-                                  GTK_TYPE_FLOAT, 0);
-
-    gtk_binding_entry_add_signal (binding_set, GDK_KP_Up, 0,
-				  "extend_selection", 3,
-				  GTK_TYPE_ENUM, GTK_SCROLL_STEP_BACKWARD,
-                                  GTK_TYPE_FLOAT, 0.0, GTK_TYPE_BOOL, TRUE);
-    gtk_binding_entry_add_signal (binding_set, GDK_KP_Down, 0,
-				  "extend_selection", 3,
-				  GTK_TYPE_ENUM, GTK_SCROLL_STEP_FORWARD,
-                                  GTK_TYPE_FLOAT, 0.0, GTK_TYPE_BOOL, TRUE);
-    gtk_binding_entry_add_signal (binding_set, GDK_KP_Page_Up, 0,
-				  "extend_selection", 3,
-				  GTK_TYPE_ENUM, GTK_SCROLL_PAGE_BACKWARD,
-                                  GTK_TYPE_FLOAT, 0.0, GTK_TYPE_BOOL, TRUE);
-    gtk_binding_entry_add_signal (binding_set, GDK_KP_Page_Down, 0,
-				  "extend_selection", 3,
-				  GTK_TYPE_ENUM, GTK_SCROLL_PAGE_FORWARD,
-                                  GTK_TYPE_FLOAT, 0.0, GTK_TYPE_BOOL, TRUE);
-    gtk_binding_entry_add_signal (binding_set, GDK_KP_Home, 0,
-				  "extend_selection", 3,
-				  GTK_TYPE_ENUM, GTK_SCROLL_JUMP,
-                                  GTK_TYPE_FLOAT, 0.0, GTK_TYPE_BOOL, TRUE);
-    gtk_binding_entry_add_signal (binding_set, GDK_KP_End, 0,
-				  "extend_selection", 3,
-				  GTK_TYPE_ENUM, GTK_SCROLL_JUMP,
-                                  GTK_TYPE_FLOAT, 1.0, GTK_TYPE_BOOL, TRUE);
-
-    gtk_binding_entry_add_signal (binding_set, GDK_Left, 0,
-				  "scroll_horizontal", 2,
-				  GTK_TYPE_ENUM, GTK_SCROLL_STEP_BACKWARD,
-                                  GTK_TYPE_FLOAT, 0.0);
-    gtk_binding_entry_add_signal (binding_set, GDK_KP_Left, 0,
-				  "scroll_horizontal", 2,
-				  GTK_TYPE_ENUM, GTK_SCROLL_STEP_BACKWARD,
-                                  GTK_TYPE_FLOAT, 0.0);
-    gtk_binding_entry_add_signal (binding_set, GDK_Right, 0,
-				  "scroll_horizontal", 2,
-				  GTK_TYPE_ENUM, GTK_SCROLL_STEP_FORWARD,
-                                  GTK_TYPE_FLOAT, 0.0);
-    gtk_binding_entry_add_signal (binding_set, GDK_KP_Right, 0,
-				  "scroll_horizontal", 2,
-				  GTK_TYPE_ENUM, GTK_SCROLL_STEP_FORWARD,
-                                  GTK_TYPE_FLOAT, 0.0);
-    gtk_binding_entry_add_signal (binding_set, GDK_Home, 0,
-				  "scroll_horizontal", 2,
-				  GTK_TYPE_ENUM, GTK_SCROLL_JUMP,
-                                  GTK_TYPE_FLOAT, 0.0);
-    gtk_binding_entry_add_signal (binding_set, GDK_End, 0,
-				  "sroll_horizontal", 2,
-				  GTK_TYPE_ENUM, GTK_SCROLL_JUMP,
-                                  GTK_TYPE_FLOAT, 1.0);
-
-    gtk_binding_entry_add_signal (binding_set, GDK_KP_Divide, 0,
-				  "undo_selection", 0);
-    gtk_binding_entry_add_signal (binding_set, GDK_Escape, 0,
-				  "abort_column_resize", 0);
-    gtk_binding_entry_add_signal (binding_set, GDK_space, 0,
-				  "toggle_focus_row", 0);
-    gtk_binding_entry_add_signal (binding_set, GDK_KP_Multiply, 0,
-				  "toggle_add_mode", 0);
-    gtk_binding_entry_add_signal (binding_set, GDK_KP_Add, 0,
-				  "select_all", 0);
-    gtk_binding_entry_add_signal (binding_set, GDK_KP_Subtract, 0,
-				  "unselect_all", 0);
-    gtk_binding_entry_add_signal (binding_set, GDK_KP_Enter, 0,
-				  "end_selection", 0);
-  }
-  */
+  binding_set = gtk_binding_set_by_class (klass);
+  gtk_binding_entry_add_signal (binding_set, GDK_Up, 0,
+				"scroll_vertical", 2,
+				GTK_TYPE_ENUM, GTK_SCROLL_STEP_BACKWARD,
+				GTK_TYPE_FLOAT, 0.0);
+  gtk_binding_entry_add_signal (binding_set, GDK_Down, 0,
+				"scroll_vertical", 2,
+				GTK_TYPE_ENUM, GTK_SCROLL_STEP_FORWARD,
+				GTK_TYPE_FLOAT, 0.0);
+  gtk_binding_entry_add_signal (binding_set, GDK_Page_Up, 0,
+				"scroll_vertical", 2,
+				GTK_TYPE_ENUM, GTK_SCROLL_PAGE_BACKWARD,
+				GTK_TYPE_FLOAT, 0.0);
+  gtk_binding_entry_add_signal (binding_set, GDK_Page_Down, 0,
+				"scroll_vertical", 2,
+				GTK_TYPE_ENUM, GTK_SCROLL_PAGE_FORWARD,
+				GTK_TYPE_FLOAT, 0.0);
+  gtk_binding_entry_add_signal (binding_set, GDK_Home, GDK_CONTROL_MASK,
+				"scroll_vertical", 2,
+				GTK_TYPE_ENUM, GTK_SCROLL_JUMP,
+				GTK_TYPE_FLOAT, 0.0);
+  gtk_binding_entry_add_signal (binding_set, GDK_End, GDK_CONTROL_MASK,
+				"scroll_vertical", 2,
+				GTK_TYPE_ENUM, GTK_SCROLL_JUMP,
+				GTK_TYPE_FLOAT, 1.0);
+
+  gtk_binding_entry_add_signal (binding_set, GDK_Up, GDK_SHIFT_MASK,
+				"extend_selection", 3,
+				GTK_TYPE_ENUM, GTK_SCROLL_STEP_BACKWARD,
+				GTK_TYPE_FLOAT, 0.0, GTK_TYPE_BOOL, TRUE);
+  gtk_binding_entry_add_signal (binding_set, GDK_Down, GDK_SHIFT_MASK,
+				"extend_selection", 3,
+				GTK_TYPE_ENUM, GTK_SCROLL_STEP_FORWARD,
+				GTK_TYPE_FLOAT, 0.0, GTK_TYPE_BOOL, TRUE);
+  gtk_binding_entry_add_signal (binding_set, GDK_Page_Up, GDK_SHIFT_MASK,
+				"extend_selection", 3,
+				GTK_TYPE_ENUM, GTK_SCROLL_PAGE_BACKWARD,
+				GTK_TYPE_FLOAT, 0.0, GTK_TYPE_BOOL, TRUE);
+  gtk_binding_entry_add_signal (binding_set, GDK_Page_Down, GDK_SHIFT_MASK,
+				"extend_selection", 3,
+				GTK_TYPE_ENUM, GTK_SCROLL_PAGE_FORWARD,
+				GTK_TYPE_FLOAT, 0.0, GTK_TYPE_BOOL, TRUE);
+  gtk_binding_entry_add_signal (binding_set, GDK_Home,
+				GDK_SHIFT_MASK | GDK_CONTROL_MASK,
+				"extend_selection", 3,
+				GTK_TYPE_ENUM, GTK_SCROLL_JUMP,
+				GTK_TYPE_FLOAT, 0.0, GTK_TYPE_BOOL, TRUE);
+  gtk_binding_entry_add_signal (binding_set, GDK_End,
+				GDK_SHIFT_MASK | GDK_CONTROL_MASK,
+				"extend_selection", 3,
+				GTK_TYPE_ENUM, GTK_SCROLL_JUMP,
+				GTK_TYPE_FLOAT, 1.0, GTK_TYPE_BOOL, TRUE);
+
+  gtk_binding_entry_add_signal (binding_set, GDK_Left, 0,
+				"scroll_horizontal", 2,
+				GTK_TYPE_ENUM, GTK_SCROLL_STEP_BACKWARD,
+				GTK_TYPE_FLOAT, 0.0);
+  gtk_binding_entry_add_signal (binding_set, GDK_Right, 0,
+				"scroll_horizontal", 2,
+				GTK_TYPE_ENUM, GTK_SCROLL_STEP_FORWARD,
+				GTK_TYPE_FLOAT, 0.0);
+  gtk_binding_entry_add_signal (binding_set, GDK_Home, 0,
+				"scroll_horizontal", 2,
+				GTK_TYPE_ENUM, GTK_SCROLL_JUMP,
+				GTK_TYPE_FLOAT, 0.0);
+  gtk_binding_entry_add_signal (binding_set, GDK_End, 0,
+				"scroll_horizontal", 2,
+				GTK_TYPE_ENUM, GTK_SCROLL_JUMP,
+				GTK_TYPE_FLOAT, 1.0);
+
+  gtk_binding_entry_add_signal (binding_set, GDK_Escape, 0,
+				"undo_selection", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_Escape, 0,
+				"abort_column_resize", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_space, 0,
+				"toggle_focus_row", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_space, GDK_CONTROL_MASK,
+				"toggle_add_mode", 0);
+  gtk_binding_entry_add_signal (binding_set, '/', GDK_CONTROL_MASK,
+				"select_all", 0);
+  gtk_binding_entry_add_signal (binding_set, '\\', GDK_CONTROL_MASK,
+				"unselect_all", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_Shift_L,
+				GDK_RELEASE_MASK | GDK_SHIFT_MASK,
+				"end_selection", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_Shift_R,
+				GDK_RELEASE_MASK | GDK_SHIFT_MASK,
+				"end_selection", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_Shift_L,
+				GDK_RELEASE_MASK | GDK_SHIFT_MASK |
+				GDK_CONTROL_MASK,
+				"end_selection", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_Shift_R,
+				GDK_RELEASE_MASK | GDK_SHIFT_MASK |
+				GDK_CONTROL_MASK,
+				"end_selection", 0);
 }
 
 static void