gimp r27672 - in trunk: . app/widgets

[martinn svn gnome org]

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

Log:
* app/widgets/gimpcontainertreeview.[ch]: Move container tree view
model column enums here and call the last enum _N_COLUMNS.

* app/widgets/widgets-enums.h: Remove the enum. It was meant only
for the container tree view class hierarchy anyway.


Modified:
   trunk/ChangeLog
   trunk/app/widgets/gimpcontainertreeview.c
   trunk/app/widgets/gimpcontainertreeview.h
   trunk/app/widgets/widgets-enums.h

Modified: trunk/app/widgets/gimpcontainertreeview.c
==============================================================================
--- trunk/app/widgets/gimpcontainertreeview.c	(original)
+++ trunk/app/widgets/gimpcontainertreeview.c	Sun Nov 16 19:59:16 2008
@@ -161,7 +161,7 @@
                                                  GIMP_TYPE_CONTAINER_TREE_VIEW,
                                                  GimpContainerTreeViewPriv);
 
-  tree_view->n_model_columns = GIMP_CONTAINER_TREE_VIEW_COLUMN_LAST;
+  tree_view->n_model_columns = GIMP_CONTAINER_TREE_VIEW_N_COLUMNS;
 
   tree_view->model_columns[GIMP_CONTAINER_TREE_VIEW_COLUMN_RENDERER]        = GIMP_TYPE_VIEW_RENDERER;
   tree_view->model_columns[GIMP_CONTAINER_TREE_VIEW_COLUMN_NAME]            = G_TYPE_STRING;

Modified: trunk/app/widgets/gimpcontainertreeview.h
==============================================================================
--- trunk/app/widgets/gimpcontainertreeview.h	(original)
+++ trunk/app/widgets/gimpcontainertreeview.h	Sun Nov 16 19:59:16 2008
@@ -26,6 +26,15 @@
 #include "gimpcontainerbox.h"
 
 
+enum
+{
+  GIMP_CONTAINER_TREE_VIEW_COLUMN_RENDERER,
+  GIMP_CONTAINER_TREE_VIEW_COLUMN_NAME,
+  GIMP_CONTAINER_TREE_VIEW_COLUMN_NAME_ATTRIBUTES,
+  GIMP_CONTAINER_TREE_VIEW_N_COLUMNS
+};
+
+
 #define GIMP_TYPE_CONTAINER_TREE_VIEW            (gimp_container_tree_view_get_type ())
 #define GIMP_CONTAINER_TREE_VIEW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CONTAINER_TREE_VIEW, GimpContainerTreeView))
 #define GIMP_CONTAINER_TREE_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CONTAINER_TREE_VIEW, GimpContainerTreeViewClass))

Modified: trunk/app/widgets/widgets-enums.h
==============================================================================
--- trunk/app/widgets/widgets-enums.h	(original)
+++ trunk/app/widgets/widgets-enums.h	Sun Nov 16 19:59:16 2008
@@ -164,14 +164,6 @@
   GIMP_VIEW_BORDER_GREEN
 } GimpViewBorderType;
 
-typedef enum /*< skip >*/
-{
-  GIMP_CONTAINER_TREE_VIEW_COLUMN_RENDERER,
-  GIMP_CONTAINER_TREE_VIEW_COLUMN_NAME,
-  GIMP_CONTAINER_TREE_VIEW_COLUMN_NAME_ATTRIBUTES,
-  GIMP_CONTAINER_TREE_VIEW_COLUMN_LAST
-} GimpContainerTreeViewColumn;
-
 typedef enum  /*< skip >*/
 {
   GIMP_DND_TYPE_NONE         = 0,