Move container tree view model column enums here and call the last enum

* 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.

svn path=/trunk/; revision=27672
This commit is contained in:
Martin Nordholts 2008-11-16 19:59:16 +00:00
parent 9eda1bb7c8
commit 72d733ce8f
4 changed files with 18 additions and 9 deletions

View File

@ -1,3 +1,11 @@
2008-11-16 Martin Nordholts <martinn@svn.gnome.org>
* 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.
2008-11-16 Martin Nordholts <martinn@svn.gnome.org>
* app/widgets/gimpcontainertreeview.[ch]

View File

@ -161,7 +161,7 @@ gimp_container_tree_view_init (GimpContainerTreeView *tree_view)
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;

View File

@ -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))

View File

@ -164,14 +164,6 @@ typedef enum /*< skip >*/
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,