app/widgets/gimpcontainergridview.c disable workarounds for bugs #110737

2003-06-21  Michael Natterer  <mitch@gimp.org>

	* app/widgets/gimpcontainergridview.c
	* app/widgets/gimpcontainertreeview.c: disable workarounds for
	bugs #110737 and #108956 for GTK+ >= 2.2.2. Will remove them as
	soon as we depend on 2.2.2.

	* app/widgets/gimpcontainertreeview.c
	(gimp_container_tree_view_select_item): disabled optimization
	which didn't select an already selected iter because it broke the
	fix for #108956. Cleanup.

ChangeLog

@@ -1,3 +1,15 @@
+2003-06-21  Michael Natterer  <mitch@gimp.org>
+
+	* app/widgets/gimpcontainergridview.c
+	* app/widgets/gimpcontainertreeview.c: disable workarounds for
+	bugs #110737 and #108956 for GTK+ >= 2.2.2. Will remove them as
+	soon as we depend on 2.2.2.
+
+	* app/widgets/gimpcontainertreeview.c
+	(gimp_container_tree_view_select_item): disabled optimization
+	which didn't select an already selected iter because it broke the
+	fix for #108956. Cleanup.
+
 2003-06-21  Sven Neumann  <sven@gimp.org>
 
 	* libgimpcolor/gimpcolorspace.c (gimp_hsv_to_rgb_int): removed

app/widgets/gimpcontainergridview.c

@@ -215,15 +215,15 @@ gimp_container_grid_view_init (GimpContainerGridView *grid_view)
   g_signal_connect (grid_view->wrap_box->parent, "size_allocate",
                     G_CALLBACK (gimp_container_grid_view_vieport_resized),
                     grid_view);
+
+#ifdef __GNUC__
+#warning FIXME: remove realize callback once we depend on GTK+ 2.2.2
+#endif
+  if (! GTK_CHECK_VERSION (2, 2, 2))
     g_signal_connect (grid_view->wrap_box->parent, "realize",
                       G_CALLBACK (gimp_container_grid_view_vieport_realize),
                       grid_view);
 
-  gtk_container_set_focus_vadjustment
-    (GTK_CONTAINER (grid_view->wrap_box->parent),
-     gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW
-                                          (view->scrolled_win)));
-
   GTK_WIDGET_SET_FLAGS (grid_view, GTK_CAN_FOCUS);
 }
 
@@ -642,9 +642,6 @@ gimp_container_grid_view_vieport_resized (GtkWidget             *widget,
     }
 }
 
-#ifdef __GNUC__
-#warning FIXME: remove realize callback once #110737 is fixed
-#endif
 static void
 gimp_container_grid_view_vieport_realize (GtkWidget             *widget,
                                           GimpContainerGridView *grid_view)

app/widgets/gimpcontainertreeview.c

@@ -512,6 +512,8 @@ gimp_container_tree_view_select_item (GimpContainerView *view,
   if (iter)
     {
       GtkTreePath *path;
+
+#if 0
       GtkTreeIter  selected_iter;
 
       if (gtk_tree_selection_get_selected (tree_view->selection, NULL,
@@ -531,6 +533,7 @@ gimp_container_tree_view_select_item (GimpContainerView *view,
           if (equal)
             return TRUE;
         }
+#endif
 
       path = gtk_tree_model_get_path (tree_view->model, iter);
 
@@ -539,13 +542,17 @@ gimp_container_tree_view_select_item (GimpContainerView *view,
 				       tree_view);
 
 #ifdef __GNUC__
-#warning FIXME: remove this hack as soon as #108956 is fixed.
+#warning FIXME: remove this hack as soon as we depend on GTK+ 2.2.2
 #endif
-      if (tree_view->main_column->editable_widget)
+      if (! GTK_CHECK_VERSION (2, 2, 2) &&
+          tree_view->main_column->editable_widget)
         gtk_cell_editable_remove_widget (tree_view->main_column->editable_widget);
 
       gtk_tree_view_set_cursor (tree_view->view, path, NULL, FALSE);
+
+#if 0
       gtk_tree_selection_select_iter (tree_view->selection, iter);
+#endif
 
       g_signal_handlers_unblock_by_func (tree_view->selection,
 					 gimp_container_tree_view_selection_changed,
@@ -767,9 +774,10 @@ gimp_container_tree_view_button_press (GtkWidget             *widget,
               gboolean success = TRUE;
 
 #ifdef __GNUC__
-#warning FIXME: remove this hack as soon as #108956 is fixed.
+#warning FIXME: remove this hack as soon as we depend on GTK+ 2.2.2
 #endif
-              if (tree_view->main_column->editable_widget)
+              if (! GTK_CHECK_VERSION (2, 2, 2) &&
+                  tree_view->main_column->editable_widget)
                 gtk_cell_editable_remove_widget (tree_view->main_column->editable_widget);
 
               /*  don't select item if a toggle was clicked */
@@ -782,8 +790,6 @@ gimp_container_tree_view_button_press (GtkWidget             *widget,
                */
               if (container_view->container)
                 {
-                  gchar *path_str = NULL;
-
                   /*  another row may have been set by selecting  */
                   gtk_tree_view_column_cell_set_cell_data (column,
                                                            tree_view->model,
@@ -791,6 +797,9 @@ gimp_container_tree_view_button_press (GtkWidget             *widget,
                                                            FALSE, FALSE);
 
                   if (toggled_cell || clicked_cell)
+                    {
+                      gchar *path_str;
+
                       path_str = gtk_tree_path_to_string (path);
  
                       if (toggled_cell)
@@ -806,10 +815,10 @@ gimp_container_tree_view_button_press (GtkWidget             *widget,
                                                                bevent->state);
                         }
 
-                  if (path_str)
                       g_free (path_str);
                     }
                 }
+            }
           else if (bevent->type == GDK_2BUTTON_PRESS)
             {
               gboolean success = TRUE;
@@ -824,9 +833,10 @@ gimp_container_tree_view_button_press (GtkWidget             *widget,
                   if (edit_cell)
                     {
 #ifdef __GNUC__
-#warning FIXME: remove this hack as soon as #108956 is fixed.
+#warning FIXME: remove this hack as soon as we depend on GTK+ 2.2.2
 #endif
-                      if (column->editable_widget)
+                      if (! GTK_CHECK_VERSION (2, 2, 2) &&
+                          column->editable_widget)
                         gtk_cell_editable_remove_widget (column->editable_widget);
 
 #ifdef __GNUC__