gimp r27671 - in trunk: . app/widgets

[martinn svn gnome org]

Author: martinn
Date: Sun Nov 16 19:48:54 2008
New Revision: 27671
URL: http://svn.gnome.org/viewvc/gimp?rev=27671&view=rev

Log:
* app/widgets/gimpcontainertreeview.[ch]
(gimp_container_tree_view_set_dnd_drop_to_empty): New setter
function so that we can make the "gboolean dnd_drop_to_empty"
class instance member private.

* app/widgets/gimpcontainertreeview-private.h: Move member here.

* app/widgets/gimpcontainertreeview-dnd.c: Go through priv pointer.

* app/widgets/gimpitemtreeview.c (gimp_item_tree_view_init): Use
the new function.


Modified:
   trunk/ChangeLog
   trunk/app/widgets/gimpcontainertreeview-dnd.c
   trunk/app/widgets/gimpcontainertreeview-private.h
   trunk/app/widgets/gimpcontainertreeview.c
   trunk/app/widgets/gimpcontainertreeview.h
   trunk/app/widgets/gimpitemtreeview.c

Modified: trunk/app/widgets/gimpcontainertreeview-dnd.c
==============================================================================
--- trunk/app/widgets/gimpcontainertreeview-dnd.c	(original)
+++ trunk/app/widgets/gimpcontainertreeview-dnd.c	Sun Nov 16 19:48:54 2008
@@ -125,7 +125,7 @@
         }
     }
 
-  if (dest_viewable || tree_view->dnd_drop_to_empty)
+  if (dest_viewable || tree_view->priv->dnd_drop_to_empty)
     {
       if (GIMP_CONTAINER_TREE_VIEW_GET_CLASS (tree_view)->drop_possible (tree_view,
                                                                          src_type,

Modified: trunk/app/widgets/gimpcontainertreeview-private.h
==============================================================================
--- trunk/app/widgets/gimpcontainertreeview-private.h	(original)
+++ trunk/app/widgets/gimpcontainertreeview-private.h	Sun Nov 16 19:48:54 2008
@@ -36,6 +36,8 @@
   guint              scroll_timeout_id;
   guint              scroll_timeout_interval;
   GdkScrollDirection scroll_dir;
+
+  gboolean           dnd_drop_to_empty;
 };
 
 

Modified: trunk/app/widgets/gimpcontainertreeview.c
==============================================================================
--- trunk/app/widgets/gimpcontainertreeview.c	(original)
+++ trunk/app/widgets/gimpcontainertreeview.c	Sun Nov 16 19:48:54 2008
@@ -396,6 +396,15 @@
 }
 
 void
+gimp_container_tree_view_set_dnd_drop_to_empty (GimpContainerTreeView *tree_view,
+                                                gboolean               dnd_drop_to_empty)
+{
+  g_return_if_fail (GIMP_IS_CONTAINER_TREE_VIEW (tree_view));
+
+  tree_view->priv->dnd_drop_to_empty = dnd_drop_to_empty;
+}
+
+void
 gimp_container_tree_view_connect_name_edited (GimpContainerTreeView *tree_view,
                                               GCallback              callback,
                                               gpointer               data)

Modified: trunk/app/widgets/gimpcontainertreeview.h
==============================================================================
--- trunk/app/widgets/gimpcontainertreeview.h	(original)
+++ trunk/app/widgets/gimpcontainertreeview.h	Sun Nov 16 19:48:54 2008
@@ -53,7 +53,6 @@
   GList                     *toggle_cells;
   GList                     *renderer_cells;
 
-  gboolean                   dnd_drop_to_empty;
   Gimp                      *dnd_gimp; /* eek */
 
   GimpContainerTreeViewPriv *priv;
@@ -106,6 +105,9 @@
                                                gint           view_size,
                                                gint           view_border_width);
 
+void        gimp_container_tree_view_set_dnd_drop_to_empty
+                                              (GimpContainerTreeView *tree_view,
+                                               gboolean               dnd_drop_to_emtpy);
 void
  gimp_container_tree_view_connect_name_edited (GimpContainerTreeView *tree_view,
                                                GCallback              callback,

Modified: trunk/app/widgets/gimpitemtreeview.c
==============================================================================
--- trunk/app/widgets/gimpitemtreeview.c	(original)
+++ trunk/app/widgets/gimpitemtreeview.c	Sun Nov 16 19:48:54 2008
@@ -257,7 +257,7 @@
   tree_view->model_columns[tree_view->n_model_columns] = G_TYPE_BOOLEAN;
   tree_view->n_model_columns++;
 
-  tree_view->dnd_drop_to_empty = TRUE;
+  gimp_container_tree_view_set_dnd_drop_to_empty (tree_view, TRUE);
 
   view->image  = NULL;