callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make instance members private (they were not accessed from the outside).

Browse Source 
* app/widgets/gimpchanneltreeview.[ch]: Make instance members
private (they were not accessed from the outside).

svn path=/trunk/; revision=27829
This commit is contained in:
Martin Nordholts
2008-12-25 12:00:18 +00:00
parent 0c3cc7f562
commit 2e1653ca8b
3 changed files with 39 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2008-12-25 Martin Nordholts <martinn@svn.gnome.org>
* app/widgets/gimpchanneltreeview.[ch]: Make instance members
private (they were not accessed from the outside).
2008-12-25 Martin Nordholts <martinn@svn.gnome.org> 2008-12-25 Martin Nordholts <martinn@svn.gnome.org>
* app/widgets/gimpitemtreeview.[ch]: Make instance members private * app/widgets/gimpitemtreeview.[ch]: Make instance members private

46
app/widgets/gimpchanneltreeview.c
View File

@ -48,6 +48,14 @@
#include "gimp-intl.h" #include "gimp-intl.h"
struct _GimpChannelTreeViewPriv
{
GtkWidget *component_editor;
GtkWidget *toselection_button;
};
static void gimp_channel_tree_view_view_iface_init (GimpContainerViewInterface *iface); static void gimp_channel_tree_view_view_iface_init (GimpContainerViewInterface *iface);
static GObject * gimp_channel_tree_view_constructor (GType type, static GObject * gimp_channel_tree_view_constructor (GType type,
@ -118,6 +126,8 @@ gimp_channel_tree_view_class_init (GimpChannelTreeViewClass *klass)
iv_class->duplicate_action = "channels-duplicate"; iv_class->duplicate_action = "channels-duplicate";
iv_class->delete_action = "channels-delete"; iv_class->delete_action = "channels-delete";
iv_class->reorder_desc = _("Reorder Channel"); iv_class->reorder_desc = _("Reorder Channel");
g_type_class_add_private (klass, sizeof (GimpChannelTreeViewPriv));
} }
static void static void
@ -132,6 +142,12 @@ gimp_channel_tree_view_view_iface_init (GimpContainerViewInterface *view_iface)
static void static void
gimp_channel_tree_view_init (GimpChannelTreeView *view) gimp_channel_tree_view_init (GimpChannelTreeView *view)
{ {
view->priv = G_TYPE_INSTANCE_GET_PRIVATE (view,
GIMP_TYPE_CHANNEL_TREE_VIEW,
GimpChannelTreeViewPriv);
view->priv->component_editor = NULL;
view->priv->toselection_button = NULL;
} }
static GObject * static GObject *
@ -157,7 +173,7 @@ gimp_channel_tree_view_constructor (GType type,
gimp_dnd_component_dest_add (GTK_WIDGET (tree_view->view), gimp_dnd_component_dest_add (GTK_WIDGET (tree_view->view),
NULL, tree_view); NULL, tree_view);
view->toselection_button = view->priv->toselection_button =
gimp_editor_add_action_button (GIMP_EDITOR (view), "channels", gimp_editor_add_action_button (GIMP_EDITOR (view), "channels",
"channels-selection-replace", "channels-selection-replace",
"channels-selection-add", "channels-selection-add",
@ -168,10 +184,10 @@ gimp_channel_tree_view_constructor (GType type,
GDK_SHIFT_MASK | GDK_CONTROL_MASK, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
NULL); NULL);
gimp_container_view_enable_dnd (GIMP_CONTAINER_VIEW (view), gimp_container_view_enable_dnd (GIMP_CONTAINER_VIEW (view),
GTK_BUTTON (view->toselection_button), GTK_BUTTON (view->priv->toselection_button),
GIMP_TYPE_CHANNEL); GIMP_TYPE_CHANNEL);
gtk_box_reorder_child (GTK_BOX (GIMP_EDITOR (view)->button_box), gtk_box_reorder_child (GTK_BOX (GIMP_EDITOR (view)->button_box),
view->toselection_button, 5); view->priv->toselection_button, 5);
return object; return object;
} }
@ -276,34 +292,34 @@ gimp_channel_tree_view_set_image (GimpItemTreeView *item_view,
{ {
GimpChannelTreeView *channel_view = GIMP_CHANNEL_TREE_VIEW (item_view); GimpChannelTreeView *channel_view = GIMP_CHANNEL_TREE_VIEW (item_view);
if (! channel_view->component_editor) if (! channel_view->priv->component_editor)
{ {
GimpContainerView *view = GIMP_CONTAINER_VIEW (item_view); GimpContainerView *view = GIMP_CONTAINER_VIEW (item_view);
gint view_size; gint view_size;
view_size = gimp_container_view_get_view_size (view, NULL); view_size = gimp_container_view_get_view_size (view, NULL);
channel_view->component_editor = channel_view->priv->component_editor =
gimp_component_editor_new (view_size, gimp_component_editor_new (view_size,
GIMP_EDITOR (item_view)->menu_factory); GIMP_EDITOR (item_view)->menu_factory);
gimp_docked_set_context (GIMP_DOCKED (channel_view->component_editor), gimp_docked_set_context (GIMP_DOCKED (channel_view->priv->component_editor),
gimp_container_view_get_context (view)); gimp_container_view_get_context (view));
gtk_box_pack_start (GTK_BOX (item_view), channel_view->component_editor, gtk_box_pack_start (GTK_BOX (item_view), channel_view->priv->component_editor,
FALSE, FALSE, 0); FALSE, FALSE, 0);
gtk_box_reorder_child (GTK_BOX (item_view), gtk_box_reorder_child (GTK_BOX (item_view),
channel_view->component_editor, 0); channel_view->priv->component_editor, 0);
} }
if (! image) if (! image)
gtk_widget_hide (channel_view->component_editor); gtk_widget_hide (channel_view->priv->component_editor);
gimp_image_editor_set_image (GIMP_IMAGE_EDITOR (channel_view->component_editor), gimp_image_editor_set_image (GIMP_IMAGE_EDITOR (channel_view->priv->component_editor),
image); image);
GIMP_ITEM_TREE_VIEW_CLASS (parent_class)->set_image (item_view, image); GIMP_ITEM_TREE_VIEW_CLASS (parent_class)->set_image (item_view, image);
if (gimp_item_tree_view_get_image (item_view)) if (gimp_item_tree_view_get_image (item_view))
gtk_widget_show (channel_view->component_editor); gtk_widget_show (channel_view->priv->component_editor);
} }
static GimpItem * static GimpItem *
@ -340,8 +356,8 @@ gimp_channel_tree_view_set_context (GimpContainerView *view,
parent_view_iface->set_context (view, context); parent_view_iface->set_context (view, context);
if (channel_view->component_editor) if (channel_view->priv->component_editor)
gimp_docked_set_context (GIMP_DOCKED (channel_view->component_editor), gimp_docked_set_context (GIMP_DOCKED (channel_view->priv->component_editor),
context); context);
} }
@ -355,7 +371,7 @@ gimp_channel_tree_view_set_view_size (GimpContainerView *view)
view_size = gimp_container_view_get_view_size (view, NULL); view_size = gimp_container_view_get_view_size (view, NULL);
if (channel_view->component_editor) if (channel_view->priv->component_editor)
gimp_component_editor_set_view_size (GIMP_COMPONENT_EDITOR (channel_view->component_editor), gimp_component_editor_set_view_size (GIMP_COMPONENT_EDITOR (channel_view->priv->component_editor),
view_size); view_size);
} }

5
app/widgets/gimpchanneltreeview.h
View File

@ -35,14 +35,13 @@
typedef struct _GimpChannelTreeViewClass GimpChannelTreeViewClass; typedef struct _GimpChannelTreeViewClass GimpChannelTreeViewClass;
typedef struct _GimpChannelTreeViewPriv GimpChannelTreeViewPriv;
struct _GimpChannelTreeView struct _GimpChannelTreeView
{ {
GimpDrawableTreeView parent_instance; GimpDrawableTreeView parent_instance;
GtkWidget *component_editor; GimpChannelTreeViewPriv *priv;
GtkWidget *toselection_button;
}; };
struct _GimpChannelTreeViewClass struct _GimpChannelTreeViewClass