dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fsck^^^ -- lovely autofoo wants "changequote([,])dnl" 

2001-08-11  Michael Natterer  <mitch@gimp.org>

	* configure.in: fsck^^^ -- lovely autofoo wants "changequote([,])dnl"

	* app/core/gimpcontext.[ch]: lots of GObject porting.

	* app/core/gimpobject.[ch]: added a "disconnect" signal, which
	like gtk's "destroy" is emitted in dispose(). This is ugly but
	I don't see another "clean" way to implement weak containers.

	* app/core/gimpcontainer.c: connect to the "disconnect" signal of
	the children of weak containes.

	* app/core/gimpimage.[ch]: replaced the "destroy" implementation
	with "dispose" + "finalize". Removed gimage->undo_history.

	* app/devices.c
	* app/gui/dialogs-constructors.c
	* app/gui/tools-commands.c
	* app/tools/tool_manager.c
	* app/widgets/gimpimagedock.c: changed accordingly.
This commit is contained in:
Michael Natterer 2001-08-11 19:53:35 +00:00 committed by Michael Natterer
parent eb50191ba9
commit 5e74fa373a
33 changed files with 693 additions and 505 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ChangeLog
View File

@ -1,3 +1,25 @@
2001-08-11 Michael Natterer <mitch@gimp.org>
* configure.in: fsck^^^ -- lovely autofoo wants "changequote([,])dnl"
* app/core/gimpcontext.[ch]: lots of GObject porting.
* app/core/gimpobject.[ch]: added a "disconnect" signal, which
like gtk's "destroy" is emitted in dispose(). This is ugly but
I don't see another "clean" way to implement weak containers.
* app/core/gimpcontainer.c: connect to the "disconnect" signal of
the children of weak containes.
* app/core/gimpimage.[ch]: replaced the "destroy" implementation
with "dispose" + "finalize". Removed gimage->undo_history.
* app/devices.c
* app/gui/dialogs-constructors.c
* app/gui/tools-commands.c
* app/tools/tool_manager.c
* app/widgets/gimpimagedock.c: changed accordingly.
2001-08-11 Sven Neumann <sven@gimp.org>
* app/tools/gimptexttool.c: made border work and fixed render offsets.

12
app/actions/tools-commands.c
View File

@ -69,15 +69,15 @@ tools_swap_contexts_cmd_callback (GtkWidget *widget,
NULL);
}
gimp_context_copy_args (gimp_get_user_context (the_gimp),
gimp_context_copy_properties (gimp_get_user_context (the_gimp),
temp_context,
GIMP_CONTEXT_ALL_ARGS_MASK);
gimp_context_copy_args (swap_context,
GIMP_CONTEXT_ALL_PROPS_MASK);
gimp_context_copy_properties (swap_context,
gimp_get_user_context (the_gimp),
GIMP_CONTEXT_ALL_ARGS_MASK);
gimp_context_copy_args (temp_context,
GIMP_CONTEXT_ALL_PROPS_MASK);
gimp_context_copy_properties (temp_context,
swap_context,
GIMP_CONTEXT_ALL_ARGS_MASK);
GIMP_CONTEXT_ALL_PROPS_MASK);
}
void

12
app/core/gimpcontainer.c
View File

@ -55,7 +55,7 @@ enum
static void gimp_container_init (GimpContainer *container);
static void gimp_container_class_init (GimpContainerClass *klass);
static void gimp_container_dispose (GObject *object);
static void gimp_container_child_destroy_callback (GtkObject *object,
static void gimp_container_disconnect_callback (GimpObject *object,
gpointer data);
@ -193,14 +193,14 @@ gimp_container_dispose (GObject *object)
}
static void
gimp_container_child_destroy_callback (GtkObject *object,
gimp_container_disconnect_callback (GimpObject *object,
gpointer data)
{
GimpContainer *container;
container = GIMP_CONTAINER (data);
gimp_container_remove (container, GIMP_OBJECT (object));
gimp_container_remove (container, object);
}
GType
@ -268,8 +268,8 @@ gimp_container_add (GimpContainer *container,
break;
case GIMP_CONTAINER_POLICY_WEAK:
g_signal_connect (G_OBJECT (object), "destroy",
G_CALLBACK (gimp_container_child_destroy_callback),
g_signal_connect (G_OBJECT (object), "disconnect",
G_CALLBACK (gimp_container_disconnect_callback),
container);
break;
}
@ -327,7 +327,7 @@ gimp_container_remove (GimpContainer *container,
case GIMP_CONTAINER_POLICY_WEAK:
g_signal_handlers_disconnect_by_func
(G_OBJECT (object),
G_CALLBACK (gimp_container_child_destroy_callback),
G_CALLBACK (gimp_container_disconnect_callback),
container);
break;
}

471
app/core/gimpcontext.c
View File

@ -47,12 +47,12 @@
#include "gdisplay.h"
typedef void (* GimpContextCopyArgFunc) (GimpContext *src,
typedef void (* GimpContextCopyPropFunc) (GimpContext *src,
GimpContext *dest);
#define context_find_defined(context,arg_mask) \
while (!(((context)->defined_args) & arg_mask) && (context)->parent) \
#define context_find_defined(context,prop_mask) \
while (!(((context)->defined_props) & prop_mask) && (context)->parent) \
(context) = (context)->parent
@ -60,13 +60,17 @@ typedef void (* GimpContextCopyArgFunc) (GimpContext *src,
static void gimp_context_class_init (GimpContextClass *klass);
static void gimp_context_init (GimpContext *context);
static void gimp_context_destroy (GtkObject *object);
static void gimp_context_set_arg (GtkObject *object,
GtkArg *arg,
guint arg_id);
static void gimp_context_get_arg (GtkObject *object,
GtkArg *arg,
guint arg_id);
static void gimp_context_finalize (GObject *object);
static void gimp_context_set_property (GObject *object,
guint property_id,
const GValue *value,
GParamSpec *pspec);
static void gimp_context_get_property (GObject *object,
guint property_id,
GValue *value,
GParamSpec *pspec);
/* image */
static void gimp_context_image_removed (GimpContainer *container,
@ -186,23 +190,23 @@ static void gimp_context_copy_buffer (GimpContext *src,
GimpContext *dest);
/* arguments & signals */
/* properties & signals */
enum
{
ARG_0,
ARG_IMAGE,
ARG_DISPLAY,
ARG_TOOL,
ARG_FOREGROUND,
ARG_BACKGROUND,
ARG_OPACITY,
ARG_PAINT_MODE,
ARG_BRUSH,
ARG_PATTERN,
ARG_GRADIENT,
ARG_PALETTE,
ARG_BUFFER
PROP_0,
PROP_IMAGE,
PROP_DISPLAY,
PROP_TOOL,
PROP_FOREGROUND,
PROP_BACKGROUND,
PROP_OPACITY,
PROP_PAINT_MODE,
PROP_BRUSH,
PROP_PATTERN,
PROP_GRADIENT,
PROP_PALETTE,
PROP_BUFFER
};
enum
@ -222,23 +226,23 @@ enum
LAST_SIGNAL
};
static gchar *gimp_context_arg_names[] =
static gchar *gimp_context_prop_names[] =
{
"GimpContext::image",
"GimpContext::display",
"GimpContext::tool",
"GimpContext::foreground",
"GimpContext::background",
"GimpContext::opacity",
"GimpContext::paint_mode",
"GimpContext::brush",
"GimpContext::pattern",
"GimpContext::gradient",
"GimpContext::palette",
"GimpContext::buffer"
"image",
"display",
"tool",
"foreground",
"background",
"opacity",
"paint_mode",
"brush",
"pattern",
"gradient",
"palette",
"buffer"
};
static GimpContextCopyArgFunc gimp_context_copy_arg_funcs[] =
static GimpContextCopyPropFunc gimp_context_copy_prop_funcs[] =
{
gimp_context_copy_image,
gimp_context_copy_display,
@ -254,7 +258,7 @@ static GimpContextCopyArgFunc gimp_context_copy_arg_funcs[] =
gimp_context_copy_buffer
};
static GType gimp_context_arg_types[] =
static GType gimp_context_prop_types[] =
{
0,
G_TYPE_NONE,
@ -339,57 +343,12 @@ gimp_context_get_type (void)
static void
gimp_context_class_init (GimpContextClass *klass)
{
GtkObjectClass *object_class;
GObjectClass *object_class;
object_class = GTK_OBJECT_CLASS (klass);
object_class = G_OBJECT_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
gimp_context_arg_types[GIMP_CONTEXT_ARG_IMAGE] = GIMP_TYPE_IMAGE;
gimp_context_arg_types[GIMP_CONTEXT_ARG_TOOL] = GIMP_TYPE_TOOL_INFO;
gimp_context_arg_types[GIMP_CONTEXT_ARG_BRUSH] = GIMP_TYPE_BRUSH;
gimp_context_arg_types[GIMP_CONTEXT_ARG_PATTERN] = GIMP_TYPE_PATTERN;
gimp_context_arg_types[GIMP_CONTEXT_ARG_GRADIENT] = GIMP_TYPE_GRADIENT;
gimp_context_arg_types[GIMP_CONTEXT_ARG_PALETTE] = GIMP_TYPE_PALETTE;
gimp_context_arg_types[GIMP_CONTEXT_ARG_BUFFER] = GIMP_TYPE_BUFFER;
gtk_object_add_arg_type (gimp_context_arg_names[IMAGE_CHANGED],
GTK_TYPE_POINTER, GTK_ARG_READWRITE,
ARG_IMAGE);
gtk_object_add_arg_type (gimp_context_arg_names[DISPLAY_CHANGED],
GTK_TYPE_POINTER, GTK_ARG_READWRITE,
ARG_DISPLAY);
gtk_object_add_arg_type (gimp_context_arg_names[TOOL_CHANGED],
GTK_TYPE_POINTER, GTK_ARG_READWRITE,
ARG_TOOL);
gtk_object_add_arg_type (gimp_context_arg_names[FOREGROUND_CHANGED],
GTK_TYPE_POINTER, GTK_ARG_READWRITE,
ARG_FOREGROUND);
gtk_object_add_arg_type (gimp_context_arg_names[BACKGROUND_CHANGED],
GTK_TYPE_POINTER, GTK_ARG_READWRITE,
ARG_BACKGROUND);
gtk_object_add_arg_type (gimp_context_arg_names[OPACITY_CHANGED],
GTK_TYPE_DOUBLE, GTK_ARG_READWRITE,
ARG_OPACITY);
gtk_object_add_arg_type (gimp_context_arg_names[PAINT_MODE_CHANGED],
GTK_TYPE_INT, GTK_ARG_READWRITE,
ARG_PAINT_MODE);
gtk_object_add_arg_type (gimp_context_arg_names[BRUSH_CHANGED],
GTK_TYPE_POINTER, GTK_ARG_READWRITE,
ARG_BRUSH);
gtk_object_add_arg_type (gimp_context_arg_names[PATTERN_CHANGED],
GTK_TYPE_POINTER, GTK_ARG_READWRITE,
ARG_PATTERN);
gtk_object_add_arg_type (gimp_context_arg_names[GRADIENT_CHANGED],
GTK_TYPE_POINTER, GTK_ARG_READWRITE,
ARG_GRADIENT);
gtk_object_add_arg_type (gimp_context_arg_names[PALETTE_CHANGED],
GTK_TYPE_POINTER, GTK_ARG_READWRITE,
ARG_PALETTE);
gtk_object_add_arg_type (gimp_context_arg_names[BUFFER_CHANGED],
GTK_TYPE_POINTER, GTK_ARG_READWRITE,
ARG_BUFFER);
gimp_context_signals[IMAGE_CHANGED] =
g_signal_new (gimp_context_signal_names[IMAGE_CHANGED],
G_TYPE_FROM_CLASS (klass),
@ -510,9 +469,9 @@ gimp_context_class_init (GimpContextClass *klass)
G_TYPE_NONE, 1,
G_TYPE_POINTER);
object_class->set_arg = gimp_context_set_arg;
object_class->get_arg = gimp_context_get_arg;
object_class->destroy = gimp_context_destroy;
object_class->set_property = gimp_context_set_property;
object_class->get_property = gimp_context_get_property;
object_class->finalize = gimp_context_finalize;
klass->image_changed = NULL;
klass->display_changed = NULL;
@ -526,6 +485,92 @@ gimp_context_class_init (GimpContextClass *klass)
klass->gradient_changed = NULL;
klass->palette_changed = NULL;
klass->buffer_changed = NULL;
gimp_context_prop_types[GIMP_CONTEXT_PROP_IMAGE] = GIMP_TYPE_IMAGE;
gimp_context_prop_types[GIMP_CONTEXT_PROP_TOOL] = GIMP_TYPE_TOOL_INFO;
gimp_context_prop_types[GIMP_CONTEXT_PROP_BRUSH] = GIMP_TYPE_BRUSH;
gimp_context_prop_types[GIMP_CONTEXT_PROP_PATTERN] = GIMP_TYPE_PATTERN;
gimp_context_prop_types[GIMP_CONTEXT_PROP_GRADIENT] = GIMP_TYPE_GRADIENT;
gimp_context_prop_types[GIMP_CONTEXT_PROP_PALETTE] = GIMP_TYPE_PALETTE;
gimp_context_prop_types[GIMP_CONTEXT_PROP_BUFFER] = GIMP_TYPE_BUFFER;
g_object_class_install_property (object_class,
PROP_IMAGE,
g_param_spec_pointer (gimp_context_prop_names[IMAGE_CHANGED],
NULL, NULL,
G_PARAM_READWRITE));
g_object_class_install_property (object_class,
PROP_DISPLAY,
g_param_spec_pointer (gimp_context_prop_names[DISPLAY_CHANGED],
NULL, NULL,
G_PARAM_READWRITE));
g_object_class_install_property (object_class,
PROP_TOOL,
g_param_spec_pointer (gimp_context_prop_names[TOOL_CHANGED],
NULL, NULL,
G_PARAM_READWRITE));
g_object_class_install_property (object_class,
PROP_FOREGROUND,
g_param_spec_pointer (gimp_context_prop_names[FOREGROUND_CHANGED],
NULL, NULL,
G_PARAM_READWRITE));
g_object_class_install_property (object_class,
PROP_BACKGROUND,
g_param_spec_pointer (gimp_context_prop_names[BACKGROUND_CHANGED],
NULL, NULL,
G_PARAM_READWRITE));
g_object_class_install_property (object_class,
PROP_OPACITY,
g_param_spec_double (gimp_context_prop_names[OPACITY_CHANGED],
NULL, NULL,
0.0,
1.0,
1.0,
G_PARAM_READWRITE));
g_object_class_install_property (object_class,
PROP_PAINT_MODE,
g_param_spec_int (gimp_context_prop_names[PAINT_MODE_CHANGED],
NULL, NULL,
NORMAL_MODE,
ANTI_ERASE_MODE,
NORMAL_MODE,
G_PARAM_READWRITE));
g_object_class_install_property (object_class,
PROP_BRUSH,
g_param_spec_pointer (gimp_context_prop_names[BRUSH_CHANGED],
NULL, NULL,
G_PARAM_READWRITE));
g_object_class_install_property (object_class,
PROP_PATTERN,
g_param_spec_pointer (gimp_context_prop_names[PATTERN_CHANGED],
NULL, NULL,
G_PARAM_READWRITE));
g_object_class_install_property (object_class,
PROP_GRADIENT,
g_param_spec_pointer (gimp_context_prop_names[GRADIENT_CHANGED],
NULL, NULL,
G_PARAM_READWRITE));
g_object_class_install_property (object_class,
PROP_PALETTE,
g_param_spec_pointer (gimp_context_prop_names[PALETTE_CHANGED],
NULL, NULL,
G_PARAM_READWRITE));
g_object_class_install_property (object_class,
PROP_BUFFER,
g_param_spec_pointer (gimp_context_prop_names[BUFFER_CHANGED],
NULL, NULL,
G_PARAM_READWRITE));
}
static void
@ -535,7 +580,7 @@ gimp_context_init (GimpContext *context)
context->parent = NULL;
context->defined_args = GIMP_CONTEXT_ALL_ARGS_MASK;
context->defined_props = GIMP_CONTEXT_ALL_PROPS_MASK;
context->image = NULL;
context->display = NULL;
@ -565,7 +610,7 @@ gimp_context_init (GimpContext *context)
}
static void
gimp_context_destroy (GtkObject *object)
gimp_context_finalize (GObject *object)
{
GimpContext *context;
@ -582,7 +627,6 @@ gimp_context_destroy (GtkObject *object)
g_object_unref (G_OBJECT (context->tool_info));
context->tool_info = NULL;
}
if (context->tool_name)
{
g_free (context->tool_name);
@ -594,7 +638,6 @@ gimp_context_destroy (GtkObject *object)
g_object_unref (G_OBJECT (context->brush));
context->brush = NULL;
}
if (context->brush_name)
{
g_free (context->brush_name);
@ -606,7 +649,6 @@ gimp_context_destroy (GtkObject *object)
g_object_unref (G_OBJECT (context->pattern));
context->pattern = NULL;
}
if (context->pattern_name)
{
g_free (context->pattern_name);
@ -618,7 +660,6 @@ gimp_context_destroy (GtkObject *object)
g_object_unref (G_OBJECT (context->gradient));
context->gradient = NULL;
}
if (context->gradient_name)
{
g_free (context->gradient_name);
@ -630,7 +671,6 @@ gimp_context_destroy (GtkObject *object)
g_object_unref (G_OBJECT (context->palette));
context->palette = NULL;
}
if (context->palette_name)
{
g_free (context->palette_name);
@ -643,111 +683,113 @@ gimp_context_destroy (GtkObject *object)
context->buffer = NULL;
}
if (GTK_OBJECT_CLASS (parent_class)->destroy)
GTK_OBJECT_CLASS (parent_class)->destroy (object);
G_OBJECT_CLASS (parent_class)->finalize (object);
}
static void
gimp_context_set_arg (GtkObject *object,
GtkArg *arg,
guint arg_id)
gimp_context_set_property (GObject *object,
guint property_id,
const GValue *value,
GParamSpec *pspec)
{
GimpContext *context;
context = GIMP_CONTEXT (object);
switch (arg_id)
switch (property_id)
{
case ARG_IMAGE:
gimp_context_set_image (context, GTK_VALUE_POINTER (*arg));
case PROP_IMAGE:
gimp_context_set_image (context, g_value_get_pointer (value));
break;
case ARG_DISPLAY:
gimp_context_set_display (context, GTK_VALUE_POINTER (*arg));
case PROP_DISPLAY:
gimp_context_set_display (context, g_value_get_pointer (value));
break;
case ARG_TOOL:
gimp_context_set_tool (context, GTK_VALUE_POINTER (*arg));
case PROP_TOOL:
gimp_context_set_tool (context, g_value_get_pointer (value));
break;
case ARG_FOREGROUND:
gimp_context_set_foreground (context, GTK_VALUE_POINTER (*arg));
case PROP_FOREGROUND:
gimp_context_set_foreground (context, g_value_get_pointer (value));
break;
case ARG_BACKGROUND:
gimp_context_set_background (context, GTK_VALUE_POINTER (*arg));
case PROP_BACKGROUND:
gimp_context_set_background (context, g_value_get_pointer (value));
break;
case ARG_OPACITY:
gimp_context_set_opacity (context, GTK_VALUE_DOUBLE (*arg));
case PROP_OPACITY:
gimp_context_set_opacity (context, g_value_get_double (value));
break;
case ARG_PAINT_MODE:
gimp_context_set_paint_mode (context, GTK_VALUE_INT (*arg));
case PROP_PAINT_MODE:
gimp_context_set_paint_mode (context, g_value_get_int (value));
break;
case ARG_BRUSH:
gimp_context_set_brush (context, GTK_VALUE_POINTER (*arg));
case PROP_BRUSH:
gimp_context_set_brush (context, g_value_get_pointer (value));
break;
case ARG_PATTERN:
gimp_context_set_pattern (context, GTK_VALUE_POINTER (*arg));
case PROP_PATTERN:
gimp_context_set_pattern (context, g_value_get_pointer (value));
break;
case ARG_GRADIENT:
gimp_context_set_gradient (context, GTK_VALUE_POINTER (*arg));
case PROP_GRADIENT:
gimp_context_set_gradient (context, g_value_get_pointer (value));
break;
case ARG_PALETTE:
gimp_context_set_palette (context, GTK_VALUE_POINTER (*arg));
case PROP_PALETTE:
gimp_context_set_palette (context, g_value_get_pointer (value));
break;
case ARG_BUFFER:
gimp_context_set_buffer (context, GTK_VALUE_POINTER (*arg));
case PROP_BUFFER:
gimp_context_set_buffer (context, g_value_get_pointer (value));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
}
}
static void
gimp_context_get_arg (GtkObject *object,
GtkArg *arg,
guint arg_id)
gimp_context_get_property (GObject *object,
guint property_id,
GValue *value,
GParamSpec *pspec)
{
GimpContext *context;
context = GIMP_CONTEXT (object);
switch (arg_id)
switch (property_id)
{
case ARG_IMAGE:
GTK_VALUE_POINTER (*arg) = gimp_context_get_image (context);
case PROP_IMAGE:
g_value_set_pointer (value, gimp_context_get_image (context));
break;
case ARG_DISPLAY:
GTK_VALUE_POINTER (*arg) = gimp_context_get_display (context);
case PROP_DISPLAY:
g_value_set_pointer (value, gimp_context_get_display (context));
break;
case ARG_TOOL:
GTK_VALUE_POINTER (*arg) = gimp_context_get_tool (context);
case PROP_TOOL:
g_value_set_pointer (value, gimp_context_get_tool (context));
break;
case ARG_FOREGROUND:
gimp_context_get_foreground (context, GTK_VALUE_POINTER (*arg));
case PROP_FOREGROUND:
gimp_context_get_foreground (context, g_value_get_pointer (value));
break;
case ARG_BACKGROUND:
gimp_context_get_background (context, GTK_VALUE_POINTER (*arg));
case PROP_BACKGROUND:
gimp_context_get_background (context, g_value_get_pointer (value));
break;
case ARG_OPACITY:
GTK_VALUE_DOUBLE (*arg) = gimp_context_get_opacity (context);
case PROP_OPACITY:
g_value_set_double (value, gimp_context_get_opacity (context));
break;
case ARG_PAINT_MODE:
GTK_VALUE_INT (*arg) = gimp_context_get_paint_mode (context);
case PROP_PAINT_MODE:
g_value_set_int (value, gimp_context_get_paint_mode (context));
break;
case ARG_BRUSH:
GTK_VALUE_POINTER (*arg) = gimp_context_get_brush (context);
case PROP_BRUSH:
g_value_set_pointer (value, gimp_context_get_brush (context));
break;
case ARG_PATTERN:
GTK_VALUE_POINTER (*arg) = gimp_context_get_pattern (context);
case PROP_PATTERN:
g_value_set_pointer (value, gimp_context_get_pattern (context));
break;
case ARG_GRADIENT:
GTK_VALUE_POINTER (*arg) = gimp_context_get_gradient (context);
case PROP_GRADIENT:
g_value_set_pointer (value, gimp_context_get_gradient (context));
break;
case ARG_PALETTE:
GTK_VALUE_POINTER (*arg) = gimp_context_get_palette (context);
case PROP_PALETTE:
g_value_set_pointer (value, gimp_context_get_palette (context));
break;
case ARG_BUFFER:
GTK_VALUE_POINTER (*arg) = gimp_context_get_buffer (context);
case PROP_BUFFER:
g_value_set_pointer (value, gimp_context_get_buffer (context));
break;
default:
arg->type = GTK_TYPE_INVALID;
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
}
}
@ -833,9 +875,10 @@ gimp_context_new (Gimp *gimp,
if (template)
{
context->defined_args = template->defined_args;
context->defined_props = template->defined_props;
gimp_context_copy_args (template, context, GIMP_CONTEXT_ALL_ARGS_MASK);
gimp_context_copy_properties (template, context,
GIMP_CONTEXT_ALL_PROPS_MASK);
}
return context;
@ -873,7 +916,7 @@ void
gimp_context_set_parent (GimpContext *context,
GimpContext *parent)
{
GimpContextArgType arg;
GimpContextPropType prop;
g_return_if_fail (GIMP_IS_CONTEXT (context));
g_return_if_fail (! parent || GIMP_IS_CONTEXT (parent));
@ -881,13 +924,13 @@ gimp_context_set_parent (GimpContext *context,
if (context == parent || context->parent == parent)
return;
for (arg = 0; arg < GIMP_CONTEXT_NUM_ARGS; arg++)
if (! ((1 << arg) & context->defined_args))
for (prop = 0; prop < GIMP_CONTEXT_NUM_PROPS; prop++)
if (! ((1 << prop) & context->defined_props))
{
gimp_context_copy_arg (parent, context, arg);
gimp_context_copy_property (parent, context, prop);
g_signal_connect_object (G_OBJECT (parent),
gimp_context_signal_names[arg],
gimp_context_signal_handlers[arg],
gimp_context_signal_names[prop],
gimp_context_signal_handlers[prop],
G_OBJECT (context),
G_CONNECT_SWAPPED);
}
@ -902,49 +945,49 @@ gimp_context_unset_parent (GimpContext *context)
if (context->parent)
{
if (context->defined_args != GIMP_CONTEXT_ALL_ARGS_MASK)
if (context->defined_props != GIMP_CONTEXT_ALL_PROPS_MASK)
gtk_signal_disconnect_by_data (GTK_OBJECT (context->parent), context);
context->parent = NULL;
}
}
/* define / undefinine context arguments */
/* define / undefinine context properties */
void
gimp_context_define_arg (GimpContext *context,
GimpContextArgType arg,
gimp_context_define_property (GimpContext *context,
GimpContextPropType prop,
gboolean defined)
{
GimpContextArgMask mask;
GimpContextPropMask mask;
g_return_if_fail (GIMP_IS_CONTEXT (context));
g_return_if_fail ((arg >= 0) && (arg < GIMP_CONTEXT_NUM_ARGS));
g_return_if_fail ((prop >= 0) && (prop < GIMP_CONTEXT_NUM_PROPS));
mask = (1 << arg);
mask = (1 << prop);
if (defined)
{
if (! (context->defined_args & mask))
if (! (context->defined_props & mask))
{
context->defined_args |= mask;
context->defined_props |= mask;
if (context->parent)
g_signal_handlers_disconnect_by_func (G_OBJECT (context->parent),
gimp_context_signal_handlers[arg],
gimp_context_signal_handlers[prop],
context);
}
}
else
{
if (context->defined_args & mask)
if (context->defined_props & mask)
{
context->defined_args &= ~mask;
context->defined_props &= ~mask;
if (context->parent)
{
gimp_context_copy_arg (context->parent, context, arg);
gimp_context_copy_property (context->parent, context, prop);
g_signal_connect_object (G_OBJECT (context->parent),
gimp_context_signal_names[arg],
gimp_context_signal_handlers[arg],
gimp_context_signal_names[prop],
gimp_context_signal_handlers[prop],
G_OBJECT (context),
G_CONNECT_SWAPPED);
}
@ -953,56 +996,56 @@ gimp_context_define_arg (GimpContext *context,
}
gboolean
gimp_context_arg_defined (GimpContext *context,
GimpContextArgType arg)
gimp_context_property_defined (GimpContext *context,
GimpContextPropType prop)
{
g_return_val_if_fail (GIMP_IS_CONTEXT (context), FALSE);
return (context->defined_args & (1 << arg)) ? TRUE : FALSE;
return (context->defined_props & (1 << prop)) ? TRUE : FALSE;
}
void
gimp_context_define_args (GimpContext *context,
GimpContextArgMask args_mask,
gimp_context_define_properties (GimpContext *context,
GimpContextPropMask props_mask,
gboolean defined)
{
GimpContextArgType arg;
GimpContextPropType prop;
g_return_if_fail (GIMP_IS_CONTEXT (context));
for (arg = 0; arg < GIMP_CONTEXT_NUM_ARGS; arg++)
if ((1 << arg) & args_mask)
gimp_context_define_arg (context, arg, defined);
for (prop = 0; prop < GIMP_CONTEXT_NUM_PROPS; prop++)
if ((1 << prop) & props_mask)
gimp_context_define_property (context, prop, defined);
}
/* copying context arguments */
/* copying context properties */
void
gimp_context_copy_arg (GimpContext *src,
gimp_context_copy_property (GimpContext *src,
GimpContext *dest,
GimpContextArgType arg)
GimpContextPropType prop)
{
g_return_if_fail (GIMP_IS_CONTEXT (src));
g_return_if_fail (GIMP_IS_CONTEXT (dest));
g_return_if_fail ((arg >= 0) && (arg < GIMP_CONTEXT_NUM_ARGS));
g_return_if_fail ((prop >= 0) && (prop < GIMP_CONTEXT_NUM_PROPS));
gimp_context_copy_arg_funcs[arg] (src, dest);
gimp_context_copy_prop_funcs[prop] (src, dest);
}
void
gimp_context_copy_args (GimpContext *src,
gimp_context_copy_properties (GimpContext *src,
GimpContext *dest,
GimpContextArgMask args_mask)
GimpContextPropMask props_mask)
{
GimpContextArgType arg;
GimpContextPropType prop;
g_return_if_fail (GIMP_IS_CONTEXT (src));
g_return_if_fail (GIMP_IS_CONTEXT (dest));
for (arg = 0; arg < GIMP_CONTEXT_NUM_ARGS; arg++)
if ((1 << arg) & args_mask)
for (prop = 0; prop < GIMP_CONTEXT_NUM_PROPS; prop++)
if ((1 << prop) & props_mask)
{
gimp_context_copy_arg (src, dest, arg);
gimp_context_copy_property (src, dest, prop);
}
}
@ -1011,14 +1054,14 @@ gimp_context_copy_args (GimpContext *src,
/*****************************************************************************/
/* manipulate by GType *****************************************************/
GimpContextArgType
gimp_context_type_to_arg (GType type)
GimpContextPropType
gimp_context_type_to_property (GType type)
{
gint i;
for (i = 0; i < GIMP_CONTEXT_NUM_ARGS; i++)
for (i = 0; i < GIMP_CONTEXT_NUM_PROPS; i++)
{
if (g_type_is_a (type, gimp_context_arg_types[i]))
if (g_type_is_a (type, gimp_context_prop_types[i]))
return i;
}
@ -1030,9 +1073,9 @@ gimp_context_type_to_signal_name (GType type)
{
gint i;
for (i = 0; i < GIMP_CONTEXT_NUM_ARGS; i++)
for (i = 0; i < GIMP_CONTEXT_NUM_PROPS; i++)
{
if (g_type_is_a (type, gimp_context_arg_types[i]))
if (g_type_is_a (type, gimp_context_prop_types[i]))
return gimp_context_signal_names[i];
}
@ -1043,14 +1086,14 @@ GimpObject *
gimp_context_get_by_type (GimpContext *context,
GType type)
{
GimpContextArgType arg;
GimpContextPropType prop;
GimpObject *object = NULL;
g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
g_return_val_if_fail ((arg = gimp_context_type_to_arg (type)) != -1, NULL);
g_return_val_if_fail ((prop = gimp_context_type_to_property (type)) != -1, NULL);
gtk_object_get (GTK_OBJECT (context),
gimp_context_arg_names[arg], &object,
gimp_context_prop_names[prop], &object,
NULL);
return object;
@ -1058,16 +1101,16 @@ gimp_context_get_by_type (GimpContext *context,
void
gimp_context_set_by_type (GimpContext *context,
GtkType type,
GType type,
GimpObject *object)
{
GimpContextArgType arg;
GimpContextPropType prop;
g_return_if_fail (GIMP_IS_CONTEXT (context));
g_return_if_fail ((arg = gimp_context_type_to_arg (type)) != -1);
g_return_if_fail ((prop = gimp_context_type_to_property (type)) != -1);
gtk_object_set (GTK_OBJECT (context),
gimp_context_arg_names[arg], object,
gimp_context_prop_names[prop], object,
NULL);
}
@ -1075,16 +1118,16 @@ void
gimp_context_changed_by_type (GimpContext *context,
GType type)
{
GimpContextArgType arg;
GimpContextPropType prop;
GimpObject *object;
g_return_if_fail (GIMP_IS_CONTEXT (context));
g_return_if_fail ((arg = gimp_context_type_to_arg (type)) != -1);
g_return_if_fail ((prop = gimp_context_type_to_property (type)) != -1);
object = gimp_context_get_by_type (context, type);
g_signal_emit (G_OBJECT (context),
gimp_context_signals[arg], 0,
gimp_context_signals[prop], 0,
object);
}

66
app/core/gimpcontext.h
View File

@ -28,20 +28,20 @@
typedef enum
{
GIMP_CONTEXT_ARG_IMAGE,
GIMP_CONTEXT_ARG_DISPLAY,
GIMP_CONTEXT_ARG_TOOL,
GIMP_CONTEXT_ARG_FOREGROUND,
GIMP_CONTEXT_ARG_BACKGROUND,
GIMP_CONTEXT_ARG_OPACITY,
GIMP_CONTEXT_ARG_PAINT_MODE,
GIMP_CONTEXT_ARG_BRUSH,
GIMP_CONTEXT_ARG_PATTERN,
GIMP_CONTEXT_ARG_GRADIENT,
GIMP_CONTEXT_ARG_PALETTE,
GIMP_CONTEXT_ARG_BUFFER,
GIMP_CONTEXT_NUM_ARGS
} GimpContextArgType;
GIMP_CONTEXT_PROP_IMAGE,
GIMP_CONTEXT_PROP_DISPLAY,
GIMP_CONTEXT_PROP_TOOL,
GIMP_CONTEXT_PROP_FOREGROUND,
GIMP_CONTEXT_PROP_BACKGROUND,
GIMP_CONTEXT_PROP_OPACITY,
GIMP_CONTEXT_PROP_PAINT_MODE,
GIMP_CONTEXT_PROP_BRUSH,
GIMP_CONTEXT_PROP_PATTERN,
GIMP_CONTEXT_PROP_GRADIENT,
GIMP_CONTEXT_PROP_PALETTE,
GIMP_CONTEXT_PROP_BUFFER,
GIMP_CONTEXT_NUM_PROPS
} GimpContextPropType;
typedef enum
{
@ -59,20 +59,20 @@ typedef enum
GIMP_CONTEXT_BUFFER_MASK = 1 << 11,
/* aliases */
GIMP_CONTEXT_PAINT_ARGS_MASK = (GIMP_CONTEXT_FOREGROUND_MASK |
GIMP_CONTEXT_PAINT_PROPS_MASK = (GIMP_CONTEXT_FOREGROUND_MASK |
GIMP_CONTEXT_BACKGROUND_MASK |
GIMP_CONTEXT_OPACITY_MASK |
GIMP_CONTEXT_PAINT_MODE_MASK |
GIMP_CONTEXT_BRUSH_MASK |
GIMP_CONTEXT_PATTERN_MASK |
GIMP_CONTEXT_GRADIENT_MASK),
GIMP_CONTEXT_ALL_ARGS_MASK = (GIMP_CONTEXT_IMAGE_MASK |
GIMP_CONTEXT_ALL_PROPS_MASK = (GIMP_CONTEXT_IMAGE_MASK |
GIMP_CONTEXT_DISPLAY_MASK |
GIMP_CONTEXT_TOOL_MASK |
GIMP_CONTEXT_PALETTE_MASK |
GIMP_CONTEXT_BUFFER_MASK |
GIMP_CONTEXT_PAINT_ARGS_MASK)
} GimpContextArgMask;
GIMP_CONTEXT_PAINT_PROPS_MASK)
} GimpContextPropMask;
#define GIMP_TYPE_CONTEXT (gimp_context_get_type ())
@ -93,7 +93,7 @@ struct _GimpContext
GimpContext *parent;
guint32 defined_args;
guint32 defined_props;
GimpImage *image;
GDisplay *display;
@ -170,34 +170,34 @@ void gimp_context_set_parent (GimpContext *context,
GimpContext *parent);
void gimp_context_unset_parent (GimpContext *context);
/* define / undefinine context arguments
/* define / undefinine context properties
*
* the value of an undefined argument will be taken from the parent context.
* the value of an undefined property will be taken from the parent context.
*/
void gimp_context_define_arg (GimpContext *context,
GimpContextArgType arg,
void gimp_context_define_property (GimpContext *context,
GimpContextPropType prop,
gboolean defined);
gboolean gimp_context_arg_defined (GimpContext *context,
GimpContextArgType arg);
gboolean gimp_context_property_defined (GimpContext *context,
GimpContextPropType prop);
void gimp_context_define_args (GimpContext *context,
GimpContextArgMask args_mask,
void gimp_context_define_properties (GimpContext *context,
GimpContextPropMask props_mask,
gboolean defined);
/* copying context arguments
/* copying context properties
*/
void gimp_context_copy_arg (GimpContext *src,
void gimp_context_copy_property (GimpContext *src,
GimpContext *dest,
GimpContextArgType arg);
GimpContextPropType prop);
void gimp_context_copy_args (GimpContext *src,
void gimp_context_copy_properties (GimpContext *src,
GimpContext *dest,
GimpContextArgMask args_mask);
GimpContextPropMask props_mask);
/* manipulate by GType */
GimpContextArgType gimp_context_type_to_arg (GType type);
GimpContextPropType gimp_context_type_to_property (GType type);
const gchar * gimp_context_type_to_signal_name (GType type);
GimpObject * gimp_context_get_by_type (GimpContext *context,

36
app/core/gimpimage-guides.c
View File

@ -68,7 +68,10 @@
/* Local function declarations */
static void gimp_image_class_init (GimpImageClass *klass);
static void gimp_image_init (GimpImage *gimage);
static void gimp_image_destroy (GtkObject *object);
static void gimp_image_dispose (GObject *object);
static void gimp_image_finalize (GObject *object);
static void gimp_image_name_changed (GimpObject *object);
static void gimp_image_invalidate_preview (GimpViewable *viewable);
static void gimp_image_size_changed (GimpViewable *viewable);
@ -215,13 +218,13 @@ gimp_image_get_type (void)
static void
gimp_image_class_init (GimpImageClass *klass)
{
GtkObjectClass *object_class;
GObjectClass *object_class;
GimpObjectClass *gimp_object_class;
GimpViewableClass *viewable_class;
object_class = (GtkObjectClass *) klass;
gimp_object_class = (GimpObjectClass *) klass;
viewable_class = (GimpViewableClass *) klass;
object_class = G_OBJECT_CLASS (klass);
gimp_object_class = GIMP_OBJECT_CLASS (klass);
viewable_class = GIMP_VIEWABLE_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
@ -350,7 +353,8 @@ gimp_image_class_init (GimpImageClass *klass)
G_TYPE_NONE, 1,
G_TYPE_INT);
object_class->destroy = gimp_image_destroy;
object_class->dispose = gimp_image_dispose;
object_class->finalize = gimp_image_finalize;
gimp_object_class->name_changed = gimp_image_name_changed;
@ -442,7 +446,6 @@ gimp_image_init (GimpImage *gimage)
gimage->undo_levels = 0;
gimage->group_count = 0;
gimage->pushing_undo_group = UNDO_NULL;
gimage->undo_history = NULL;
gimage->new_undo_stack = gimp_undo_stack_new (gimage);
gimage->new_redo_stack = gimp_undo_stack_new (gimage);
@ -452,7 +455,19 @@ gimp_image_init (GimpImage *gimage)
}
static void
gimp_image_destroy (GtkObject *object)
gimp_image_dispose (GObject *object)
{
GimpImage *gimage;
gimage = GIMP_IMAGE (object);
undo_free (gimage);
G_OBJECT_CLASS (parent_class)->dispose (object);
}
static void
gimp_image_finalize (GObject *object)
{
GimpImage *gimage;
@ -518,8 +533,6 @@ gimp_image_destroy (GtkObject *object)
gimage->guides = NULL;
}
undo_free (gimage);
if (gimage->new_undo_stack)
{
g_object_unref (G_OBJECT (gimage->new_undo_stack));
@ -531,8 +544,7 @@ gimp_image_destroy (GtkObject *object)
gimage->new_redo_stack = NULL;
}
if (GTK_OBJECT_CLASS (parent_class)->destroy)
GTK_OBJECT_CLASS (parent_class)->destroy (object);
G_OBJECT_CLASS (parent_class)->finalize (object);
}
static void

1
app/core/gimpimage-guides.h
View File

@ -122,7 +122,6 @@ struct _GimpImage
gint undo_levels; /* levels in undo stack */
gint group_count; /* nested undo groups */
UndoType pushing_undo_group; /* undo group status flag */
GtkWidget *undo_history; /* history viewer, or NULL */
/* New undo apparatus */
GimpUndoStack *new_undo_stack; /* stack for undo operations */

36
app/core/gimpimage-merge.c
View File

@ -68,7 +68,10 @@
/* Local function declarations */
static void gimp_image_class_init (GimpImageClass *klass);
static void gimp_image_init (GimpImage *gimage);
static void gimp_image_destroy (GtkObject *object);
static void gimp_image_dispose (GObject *object);
static void gimp_image_finalize (GObject *object);
static void gimp_image_name_changed (GimpObject *object);
static void gimp_image_invalidate_preview (GimpViewable *viewable);
static void gimp_image_size_changed (GimpViewable *viewable);
@ -215,13 +218,13 @@ gimp_image_get_type (void)
static void
gimp_image_class_init (GimpImageClass *klass)
{
GtkObjectClass *object_class;
GObjectClass *object_class;
GimpObjectClass *gimp_object_class;
GimpViewableClass *viewable_class;
object_class = (GtkObjectClass *) klass;
gimp_object_class = (GimpObjectClass *) klass;
viewable_class = (GimpViewableClass *) klass;
object_class = G_OBJECT_CLASS (klass);
gimp_object_class = GIMP_OBJECT_CLASS (klass);
viewable_class = GIMP_VIEWABLE_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
@ -350,7 +353,8 @@ gimp_image_class_init (GimpImageClass *klass)
G_TYPE_NONE, 1,
G_TYPE_INT);
object_class->destroy = gimp_image_destroy;
object_class->dispose = gimp_image_dispose;
object_class->finalize = gimp_image_finalize;
gimp_object_class->name_changed = gimp_image_name_changed;
@ -442,7 +446,6 @@ gimp_image_init (GimpImage *gimage)
gimage->undo_levels = 0;
gimage->group_count = 0;
gimage->pushing_undo_group = UNDO_NULL;
gimage->undo_history = NULL;
gimage->new_undo_stack = gimp_undo_stack_new (gimage);
gimage->new_redo_stack = gimp_undo_stack_new (gimage);
@ -452,7 +455,19 @@ gimp_image_init (GimpImage *gimage)
}
static void
gimp_image_destroy (GtkObject *object)
gimp_image_dispose (GObject *object)
{
GimpImage *gimage;
gimage = GIMP_IMAGE (object);
undo_free (gimage);
G_OBJECT_CLASS (parent_class)->dispose (object);
}
static void
gimp_image_finalize (GObject *object)
{
GimpImage *gimage;
@ -518,8 +533,6 @@ gimp_image_destroy (GtkObject *object)
gimage->guides = NULL;
}
undo_free (gimage);
if (gimage->new_undo_stack)
{
g_object_unref (G_OBJECT (gimage->new_undo_stack));
@ -531,8 +544,7 @@ gimp_image_destroy (GtkObject *object)
gimage->new_redo_stack = NULL;
}
if (GTK_OBJECT_CLASS (parent_class)->destroy)
GTK_OBJECT_CLASS (parent_class)->destroy (object);
G_OBJECT_CLASS (parent_class)->finalize (object);
}
static void

1
app/core/gimpimage-merge.h
View File

@ -122,7 +122,6 @@ struct _GimpImage
gint undo_levels; /* levels in undo stack */
gint group_count; /* nested undo groups */
UndoType pushing_undo_group; /* undo group status flag */
GtkWidget *undo_history; /* history viewer, or NULL */
/* New undo apparatus */
GimpUndoStack *new_undo_stack; /* stack for undo operations */

36
app/core/gimpimage-projection.c
View File

@ -68,7 +68,10 @@
/* Local function declarations */
static void gimp_image_class_init (GimpImageClass *klass);
static void gimp_image_init (GimpImage *gimage);
static void gimp_image_destroy (GtkObject *object);
static void gimp_image_dispose (GObject *object);
static void gimp_image_finalize (GObject *object);
static void gimp_image_name_changed (GimpObject *object);
static void gimp_image_invalidate_preview (GimpViewable *viewable);
static void gimp_image_size_changed (GimpViewable *viewable);
@ -215,13 +218,13 @@ gimp_image_get_type (void)
static void
gimp_image_class_init (GimpImageClass *klass)
{
GtkObjectClass *object_class;
GObjectClass *object_class;
GimpObjectClass *gimp_object_class;
GimpViewableClass *viewable_class;
object_class = (GtkObjectClass *) klass;
gimp_object_class = (GimpObjectClass *) klass;
viewable_class = (GimpViewableClass *) klass;
object_class = G_OBJECT_CLASS (klass);
gimp_object_class = GIMP_OBJECT_CLASS (klass);
viewable_class = GIMP_VIEWABLE_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
@ -350,7 +353,8 @@ gimp_image_class_init (GimpImageClass *klass)
G_TYPE_NONE, 1,
G_TYPE_INT);
object_class->destroy = gimp_image_destroy;
object_class->dispose = gimp_image_dispose;
object_class->finalize = gimp_image_finalize;
gimp_object_class->name_changed = gimp_image_name_changed;
@ -442,7 +446,6 @@ gimp_image_init (GimpImage *gimage)
gimage->undo_levels = 0;
gimage->group_count = 0;
gimage->pushing_undo_group = UNDO_NULL;
gimage->undo_history = NULL;
gimage->new_undo_stack = gimp_undo_stack_new (gimage);
gimage->new_redo_stack = gimp_undo_stack_new (gimage);
@ -452,7 +455,19 @@ gimp_image_init (GimpImage *gimage)
}
static void
gimp_image_destroy (GtkObject *object)
gimp_image_dispose (GObject *object)
{
GimpImage *gimage;
gimage = GIMP_IMAGE (object);
undo_free (gimage);
G_OBJECT_CLASS (parent_class)->dispose (object);
}
static void
gimp_image_finalize (GObject *object)
{
GimpImage *gimage;
@ -518,8 +533,6 @@ gimp_image_destroy (GtkObject *object)
gimage->guides = NULL;
}
undo_free (gimage);
if (gimage->new_undo_stack)
{
g_object_unref (G_OBJECT (gimage->new_undo_stack));
@ -531,8 +544,7 @@ gimp_image_destroy (GtkObject *object)
gimage->new_redo_stack = NULL;
}
if (GTK_OBJECT_CLASS (parent_class)->destroy)
GTK_OBJECT_CLASS (parent_class)->destroy (object);
G_OBJECT_CLASS (parent_class)->finalize (object);
}
static void

1
app/core/gimpimage-projection.h
View File

@ -122,7 +122,6 @@ struct _GimpImage
gint undo_levels; /* levels in undo stack */
gint group_count; /* nested undo groups */
UndoType pushing_undo_group; /* undo group status flag */
GtkWidget *undo_history; /* history viewer, or NULL */
/* New undo apparatus */
GimpUndoStack *new_undo_stack; /* stack for undo operations */

36
app/core/gimpimage-resize.c
View File

@ -68,7 +68,10 @@
/* Local function declarations */
static void gimp_image_class_init (GimpImageClass *klass);
static void gimp_image_init (GimpImage *gimage);
static void gimp_image_destroy (GtkObject *object);
static void gimp_image_dispose (GObject *object);
static void gimp_image_finalize (GObject *object);
static void gimp_image_name_changed (GimpObject *object);
static void gimp_image_invalidate_preview (GimpViewable *viewable);
static void gimp_image_size_changed (GimpViewable *viewable);
@ -215,13 +218,13 @@ gimp_image_get_type (void)
static void
gimp_image_class_init (GimpImageClass *klass)
{
GtkObjectClass *object_class;
GObjectClass *object_class;
GimpObjectClass *gimp_object_class;
GimpViewableClass *viewable_class;
object_class = (GtkObjectClass *) klass;
gimp_object_class = (GimpObjectClass *) klass;
viewable_class = (GimpViewableClass *) klass;
object_class = G_OBJECT_CLASS (klass);
gimp_object_class = GIMP_OBJECT_CLASS (klass);
viewable_class = GIMP_VIEWABLE_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
@ -350,7 +353,8 @@ gimp_image_class_init (GimpImageClass *klass)
G_TYPE_NONE, 1,
G_TYPE_INT);
object_class->destroy = gimp_image_destroy;
object_class->dispose = gimp_image_dispose;
object_class->finalize = gimp_image_finalize;
gimp_object_class->name_changed = gimp_image_name_changed;
@ -442,7 +446,6 @@ gimp_image_init (GimpImage *gimage)
gimage->undo_levels = 0;
gimage->group_count = 0;
gimage->pushing_undo_group = UNDO_NULL;
gimage->undo_history = NULL;
gimage->new_undo_stack = gimp_undo_stack_new (gimage);
gimage->new_redo_stack = gimp_undo_stack_new (gimage);
@ -452,7 +455,19 @@ gimp_image_init (GimpImage *gimage)
}
static void
gimp_image_destroy (GtkObject *object)
gimp_image_dispose (GObject *object)
{
GimpImage *gimage;
gimage = GIMP_IMAGE (object);
undo_free (gimage);
G_OBJECT_CLASS (parent_class)->dispose (object);
}
static void
gimp_image_finalize (GObject *object)
{
GimpImage *gimage;
@ -518,8 +533,6 @@ gimp_image_destroy (GtkObject *object)
gimage->guides = NULL;
}
undo_free (gimage);
if (gimage->new_undo_stack)
{
g_object_unref (G_OBJECT (gimage->new_undo_stack));
@ -531,8 +544,7 @@ gimp_image_destroy (GtkObject *object)
gimage->new_redo_stack = NULL;
}
if (GTK_OBJECT_CLASS (parent_class)->destroy)
GTK_OBJECT_CLASS (parent_class)->destroy (object);
G_OBJECT_CLASS (parent_class)->finalize (object);
}
static void

1
app/core/gimpimage-resize.h
View File

@ -122,7 +122,6 @@ struct _GimpImage
gint undo_levels; /* levels in undo stack */
gint group_count; /* nested undo groups */
UndoType pushing_undo_group; /* undo group status flag */
GtkWidget *undo_history; /* history viewer, or NULL */
/* New undo apparatus */
GimpUndoStack *new_undo_stack; /* stack for undo operations */

36
app/core/gimpimage-scale.c
View File

@ -68,7 +68,10 @@
/* Local function declarations */
static void gimp_image_class_init (GimpImageClass *klass);
static void gimp_image_init (GimpImage *gimage);
static void gimp_image_destroy (GtkObject *object);
static void gimp_image_dispose (GObject *object);
static void gimp_image_finalize (GObject *object);
static void gimp_image_name_changed (GimpObject *object);
static void gimp_image_invalidate_preview (GimpViewable *viewable);
static void gimp_image_size_changed (GimpViewable *viewable);
@ -215,13 +218,13 @@ gimp_image_get_type (void)
static void
gimp_image_class_init (GimpImageClass *klass)
{
GtkObjectClass *object_class;
GObjectClass *object_class;
GimpObjectClass *gimp_object_class;
GimpViewableClass *viewable_class;
object_class = (GtkObjectClass *) klass;
gimp_object_class = (GimpObjectClass *) klass;
viewable_class = (GimpViewableClass *) klass;
object_class = G_OBJECT_CLASS (klass);
gimp_object_class = GIMP_OBJECT_CLASS (klass);
viewable_class = GIMP_VIEWABLE_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
@ -350,7 +353,8 @@ gimp_image_class_init (GimpImageClass *klass)
G_TYPE_NONE, 1,
G_TYPE_INT);
object_class->destroy = gimp_image_destroy;
object_class->dispose = gimp_image_dispose;
object_class->finalize = gimp_image_finalize;
gimp_object_class->name_changed = gimp_image_name_changed;
@ -442,7 +446,6 @@ gimp_image_init (GimpImage *gimage)
gimage->undo_levels = 0;
gimage->group_count = 0;
gimage->pushing_undo_group = UNDO_NULL;
gimage->undo_history = NULL;
gimage->new_undo_stack = gimp_undo_stack_new (gimage);
gimage->new_redo_stack = gimp_undo_stack_new (gimage);
@ -452,7 +455,19 @@ gimp_image_init (GimpImage *gimage)
}
static void
gimp_image_destroy (GtkObject *object)
gimp_image_dispose (GObject *object)
{
GimpImage *gimage;
gimage = GIMP_IMAGE (object);
undo_free (gimage);
G_OBJECT_CLASS (parent_class)->dispose (object);
}
static void
gimp_image_finalize (GObject *object)
{
GimpImage *gimage;
@ -518,8 +533,6 @@ gimp_image_destroy (GtkObject *object)
gimage->guides = NULL;
}
undo_free (gimage);
if (gimage->new_undo_stack)
{
g_object_unref (G_OBJECT (gimage->new_undo_stack));
@ -531,8 +544,7 @@ gimp_image_destroy (GtkObject *object)
gimage->new_redo_stack = NULL;
}
if (GTK_OBJECT_CLASS (parent_class)->destroy)
GTK_OBJECT_CLASS (parent_class)->destroy (object);
G_OBJECT_CLASS (parent_class)->finalize (object);
}
static void

1
app/core/gimpimage-scale.h
View File

@ -122,7 +122,6 @@ struct _GimpImage
gint undo_levels; /* levels in undo stack */
gint group_count; /* nested undo groups */
UndoType pushing_undo_group; /* undo group status flag */
GtkWidget *undo_history; /* history viewer, or NULL */
/* New undo apparatus */
GimpUndoStack *new_undo_stack; /* stack for undo operations */

36
app/core/gimpimage.c
View File

@ -68,7 +68,10 @@
/* Local function declarations */
static void gimp_image_class_init (GimpImageClass *klass);
static void gimp_image_init (GimpImage *gimage);
static void gimp_image_destroy (GtkObject *object);
static void gimp_image_dispose (GObject *object);
static void gimp_image_finalize (GObject *object);
static void gimp_image_name_changed (GimpObject *object);
static void gimp_image_invalidate_preview (GimpViewable *viewable);
static void gimp_image_size_changed (GimpViewable *viewable);
@ -215,13 +218,13 @@ gimp_image_get_type (void)
static void
gimp_image_class_init (GimpImageClass *klass)
{
GtkObjectClass *object_class;
GObjectClass *object_class;
GimpObjectClass *gimp_object_class;
GimpViewableClass *viewable_class;
object_class = (GtkObjectClass *) klass;
gimp_object_class = (GimpObjectClass *) klass;
viewable_class = (GimpViewableClass *) klass;
object_class = G_OBJECT_CLASS (klass);
gimp_object_class = GIMP_OBJECT_CLASS (klass);
viewable_class = GIMP_VIEWABLE_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
@ -350,7 +353,8 @@ gimp_image_class_init (GimpImageClass *klass)
G_TYPE_NONE, 1,
G_TYPE_INT);
object_class->destroy = gimp_image_destroy;
object_class->dispose = gimp_image_dispose;
object_class->finalize = gimp_image_finalize;
gimp_object_class->name_changed = gimp_image_name_changed;
@ -442,7 +446,6 @@ gimp_image_init (GimpImage *gimage)
gimage->undo_levels = 0;
gimage->group_count = 0;
gimage->pushing_undo_group = UNDO_NULL;
gimage->undo_history = NULL;
gimage->new_undo_stack = gimp_undo_stack_new (gimage);
gimage->new_redo_stack = gimp_undo_stack_new (gimage);
@ -452,7 +455,19 @@ gimp_image_init (GimpImage *gimage)
}
static void
gimp_image_destroy (GtkObject *object)
gimp_image_dispose (GObject *object)
{
GimpImage *gimage;
gimage = GIMP_IMAGE (object);
undo_free (gimage);
G_OBJECT_CLASS (parent_class)->dispose (object);
}
static void
gimp_image_finalize (GObject *object)
{
GimpImage *gimage;
@ -518,8 +533,6 @@ gimp_image_destroy (GtkObject *object)
gimage->guides = NULL;
}
undo_free (gimage);
if (gimage->new_undo_stack)
{
g_object_unref (G_OBJECT (gimage->new_undo_stack));
@ -531,8 +544,7 @@ gimp_image_destroy (GtkObject *object)
gimage->new_redo_stack = NULL;
}
if (GTK_OBJECT_CLASS (parent_class)->destroy)
GTK_OBJECT_CLASS (parent_class)->destroy (object);
G_OBJECT_CLASS (parent_class)->finalize (object);
}
static void

1
app/core/gimpimage.h
View File

@ -122,7 +122,6 @@ struct _GimpImage
gint undo_levels; /* levels in undo stack */
gint group_count; /* nested undo groups */
UndoType pushing_undo_group; /* undo group status flag */
GtkWidget *undo_history; /* history viewer, or NULL */
/* New undo apparatus */
GimpUndoStack *new_undo_stack; /* stack for undo operations */

21
app/core/gimpobject.c
View File

@ -29,6 +29,7 @@
enum
{
DISCONNECT,
NAME_CHANGED,
LAST_SIGNAL
};
@ -43,7 +44,9 @@ enum
static void gimp_object_class_init (GimpObjectClass *klass);
static void gimp_object_init (GimpObject *object);
static void gimp_object_dispose (GObject *object);
static void gimp_object_finalize (GObject *object);
static void gimp_object_set_property (GObject *object,
guint property_id,
const GValue *value,
@ -96,6 +99,15 @@ gimp_object_class_init (GimpObjectClass *klass)
parent_class = g_type_class_peek_parent (klass);
object_signals[DISCONNECT] =
g_signal_new ("disconnect",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpObjectClass, disconnect),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
object_signals[NAME_CHANGED] =
g_signal_new ("name_changed",
G_TYPE_FROM_CLASS (klass),
@ -105,6 +117,7 @@ gimp_object_class_init (GimpObjectClass *klass)
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
object_class->dispose = gimp_object_dispose;
object_class->finalize = gimp_object_finalize;
object_class->set_property = gimp_object_set_property;
object_class->get_property = gimp_object_get_property;
@ -125,6 +138,14 @@ gimp_object_init (GimpObject *object)
object->name = NULL;
}
static void
gimp_object_dispose (GObject *object)
{
g_signal_emit (G_OBJECT (object), object_signals[DISCONNECT], 0);
G_OBJECT_CLASS (parent_class)->dispose (object);
}
static void
gimp_object_finalize (GObject *object)
{

2
app/core/gimpobject.h
View File

@ -28,6 +28,7 @@
#define GIMP_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_OBJECT, GimpObjectClass))
#define GIMP_IS_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OBJECT))
#define GIMP_IS_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_OBJECT))
#define GIMP_OBJECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_OBJECT, GimpObjectClass))
typedef struct _GimpObjectClass GimpObjectClass;
@ -43,6 +44,7 @@ struct _GimpObjectClass
{
GtkObjectClass parent_class;
void (* disconnect) (GimpObject *object);
void (* name_changed) (GimpObject *object);
};

36
app/core/gimpprojection-construct.c
View File

@ -68,7 +68,10 @@
/* Local function declarations */
static void gimp_image_class_init (GimpImageClass *klass);
static void gimp_image_init (GimpImage *gimage);
static void gimp_image_destroy (GtkObject *object);
static void gimp_image_dispose (GObject *object);
static void gimp_image_finalize (GObject *object);
static void gimp_image_name_changed (GimpObject *object);
static void gimp_image_invalidate_preview (GimpViewable *viewable);
static void gimp_image_size_changed (GimpViewable *viewable);
@ -215,13 +218,13 @@ gimp_image_get_type (void)
static void
gimp_image_class_init (GimpImageClass *klass)
{
GtkObjectClass *object_class;
GObjectClass *object_class;
GimpObjectClass *gimp_object_class;
GimpViewableClass *viewable_class;
object_class = (GtkObjectClass *) klass;
gimp_object_class = (GimpObjectClass *) klass;
viewable_class = (GimpViewableClass *) klass;
object_class = G_OBJECT_CLASS (klass);
gimp_object_class = GIMP_OBJECT_CLASS (klass);
viewable_class = GIMP_VIEWABLE_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
@ -350,7 +353,8 @@ gimp_image_class_init (GimpImageClass *klass)
G_TYPE_NONE, 1,
G_TYPE_INT);
object_class->destroy = gimp_image_destroy;
object_class->dispose = gimp_image_dispose;
object_class->finalize = gimp_image_finalize;
gimp_object_class->name_changed = gimp_image_name_changed;
@ -442,7 +446,6 @@ gimp_image_init (GimpImage *gimage)
gimage->undo_levels = 0;
gimage->group_count = 0;
gimage->pushing_undo_group = UNDO_NULL;
gimage->undo_history = NULL;
gimage->new_undo_stack = gimp_undo_stack_new (gimage);
gimage->new_redo_stack = gimp_undo_stack_new (gimage);
@ -452,7 +455,19 @@ gimp_image_init (GimpImage *gimage)
}
static void
gimp_image_destroy (GtkObject *object)
gimp_image_dispose (GObject *object)
{
GimpImage *gimage;
gimage = GIMP_IMAGE (object);
undo_free (gimage);
G_OBJECT_CLASS (parent_class)->dispose (object);
}
static void
gimp_image_finalize (GObject *object)
{
GimpImage *gimage;
@ -518,8 +533,6 @@ gimp_image_destroy (GtkObject *object)
gimage->guides = NULL;
}
undo_free (gimage);
if (gimage->new_undo_stack)
{
g_object_unref (G_OBJECT (gimage->new_undo_stack));
@ -531,8 +544,7 @@ gimp_image_destroy (GtkObject *object)
gimage->new_redo_stack = NULL;
}
if (GTK_OBJECT_CLASS (parent_class)->destroy)
GTK_OBJECT_CLASS (parent_class)->destroy (object);
G_OBJECT_CLASS (parent_class)->finalize (object);
}
static void

1
app/core/gimpprojection-construct.h
View File

@ -122,7 +122,6 @@ struct _GimpImage
gint undo_levels; /* levels in undo stack */
gint group_count; /* nested undo groups */
UndoType pushing_undo_group; /* undo group status flag */
GtkWidget *undo_history; /* history viewer, or NULL */
/* New undo apparatus */
GimpUndoStack *new_undo_stack; /* stack for undo operations */

14
app/devices.c
View File

@ -267,10 +267,10 @@ devices_init (void)
device_info->context = gimp_create_context (the_gimp,
device_info->name, NULL);
gimp_context_define_args (device_info->context,
gimp_context_define_properties (device_info->context,
DEVICE_CONTEXT_MASK,
FALSE);
gimp_context_copy_args (gimp_get_user_context (the_gimp),
gimp_context_copy_properties (gimp_get_user_context (the_gimp),
device_info->context,
DEVICE_CONTEXT_MASK);
device_status_context_connect (device_info->context,
@ -299,7 +299,8 @@ devices_restore (void)
context = gimp_get_user_context (the_gimp);
gimp_context_copy_args (device_info->context, context, DEVICE_CONTEXT_MASK);
gimp_context_copy_properties (device_info->context, context,
DEVICE_CONTEXT_MASK);
gimp_context_set_parent (device_info->context, context);
suppress_update = FALSE;
@ -364,10 +365,10 @@ devices_rc_update (gchar *name,
device_info->context = gimp_create_context (the_gimp,
device_info->name, NULL);
gimp_context_define_args (device_info->context,
gimp_context_define_properties (device_info->context,
DEVICE_CONTEXT_MASK,
FALSE);
gimp_context_copy_args (gimp_get_user_context (the_gimp),
gimp_context_copy_properties (gimp_get_user_context (the_gimp),
device_info->context,
DEVICE_CONTEXT_MASK);
device_status_context_connect (device_info->context,
@ -523,7 +524,8 @@ select_device (GdkDevice *new_device)
context = gimp_get_user_context (the_gimp);
gimp_context_copy_args (device_info->context, context, DEVICE_CONTEXT_MASK);
gimp_context_copy_properties (device_info->context, context,
DEVICE_CONTEXT_MASK);
gimp_context_set_parent (device_info->context, context);
suppress_update = FALSE;

13
app/dialogs/dialogs-constructors.c
View File

@ -240,6 +240,7 @@ dialogs_undo_history_get (GimpDialogFactory *factory,
{
GDisplay *gdisp;
GimpImage *gimage;
GtkWidget *undo_history;
gdisp = gimp_context_get_display (context);
@ -248,10 +249,16 @@ dialogs_undo_history_get (GimpDialogFactory *factory,
gimage = gdisp->gimage;
if (! gimage->undo_history)
gimage->undo_history = undo_history_new (gimage);
undo_history = g_object_get_data (G_OBJECT (gimage), "undo-history");
return gimage->undo_history;
if (! undo_history)
{
undo_history = undo_history_new (gimage);
g_object_set_data (G_OBJECT (gimage), "undo-history", undo_history);
}
return undo_history;
}
GtkWidget *

14
app/gui/device-status-dialog.c
View File

@ -267,10 +267,10 @@ devices_init (void)
device_info->context = gimp_create_context (the_gimp,
device_info->name, NULL);
gimp_context_define_args (device_info->context,
gimp_context_define_properties (device_info->context,
DEVICE_CONTEXT_MASK,
FALSE);
gimp_context_copy_args (gimp_get_user_context (the_gimp),
gimp_context_copy_properties (gimp_get_user_context (the_gimp),
device_info->context,
DEVICE_CONTEXT_MASK);
device_status_context_connect (device_info->context,
@ -299,7 +299,8 @@ devices_restore (void)
context = gimp_get_user_context (the_gimp);
gimp_context_copy_args (device_info->context, context, DEVICE_CONTEXT_MASK);
gimp_context_copy_properties (device_info->context, context,
DEVICE_CONTEXT_MASK);
gimp_context_set_parent (device_info->context, context);
suppress_update = FALSE;
@ -364,10 +365,10 @@ devices_rc_update (gchar *name,
device_info->context = gimp_create_context (the_gimp,
device_info->name, NULL);
gimp_context_define_args (device_info->context,
gimp_context_define_properties (device_info->context,
DEVICE_CONTEXT_MASK,
FALSE);
gimp_context_copy_args (gimp_get_user_context (the_gimp),
gimp_context_copy_properties (gimp_get_user_context (the_gimp),
device_info->context,
DEVICE_CONTEXT_MASK);
device_status_context_connect (device_info->context,
@ -523,7 +524,8 @@ select_device (GdkDevice *new_device)
context = gimp_get_user_context (the_gimp);
gimp_context_copy_args (device_info->context, context, DEVICE_CONTEXT_MASK);
gimp_context_copy_properties (device_info->context, context,
DEVICE_CONTEXT_MASK);
gimp_context_set_parent (device_info->context, context);
suppress_update = FALSE;

13
app/gui/dialogs-constructors.c
View File

@ -240,6 +240,7 @@ dialogs_undo_history_get (GimpDialogFactory *factory,
{
GDisplay *gdisp;
GimpImage *gimage;
GtkWidget *undo_history;
gdisp = gimp_context_get_display (context);
@ -248,10 +249,16 @@ dialogs_undo_history_get (GimpDialogFactory *factory,
gimage = gdisp->gimage;
if (! gimage->undo_history)
gimage->undo_history = undo_history_new (gimage);
undo_history = g_object_get_data (G_OBJECT (gimage), "undo-history");
return gimage->undo_history;
if (! undo_history)
{
undo_history = undo_history_new (gimage);
g_object_set_data (G_OBJECT (gimage), "undo-history", undo_history);
}
return undo_history;
}
GtkWidget *

14
app/gui/input-dialog.c
View File

@ -267,10 +267,10 @@ devices_init (void)
device_info->context = gimp_create_context (the_gimp,
device_info->name, NULL);
gimp_context_define_args (device_info->context,
gimp_context_define_properties (device_info->context,
DEVICE_CONTEXT_MASK,
FALSE);
gimp_context_copy_args (gimp_get_user_context (the_gimp),
gimp_context_copy_properties (gimp_get_user_context (the_gimp),
device_info->context,
DEVICE_CONTEXT_MASK);
device_status_context_connect (device_info->context,
@ -299,7 +299,8 @@ devices_restore (void)
context = gimp_get_user_context (the_gimp);
gimp_context_copy_args (device_info->context, context, DEVICE_CONTEXT_MASK);
gimp_context_copy_properties (device_info->context, context,
DEVICE_CONTEXT_MASK);
gimp_context_set_parent (device_info->context, context);
suppress_update = FALSE;
@ -364,10 +365,10 @@ devices_rc_update (gchar *name,
device_info->context = gimp_create_context (the_gimp,
device_info->name, NULL);
gimp_context_define_args (device_info->context,
gimp_context_define_properties (device_info->context,
DEVICE_CONTEXT_MASK,
FALSE);
gimp_context_copy_args (gimp_get_user_context (the_gimp),
gimp_context_copy_properties (gimp_get_user_context (the_gimp),
device_info->context,
DEVICE_CONTEXT_MASK);
device_status_context_connect (device_info->context,
@ -523,7 +524,8 @@ select_device (GdkDevice *new_device)
context = gimp_get_user_context (the_gimp);
gimp_context_copy_args (device_info->context, context, DEVICE_CONTEXT_MASK);
gimp_context_copy_properties (device_info->context, context,
DEVICE_CONTEXT_MASK);
gimp_context_set_parent (device_info->context, context);
suppress_update = FALSE;

12
app/gui/tools-commands.c
View File

@ -69,15 +69,15 @@ tools_swap_contexts_cmd_callback (GtkWidget *widget,
NULL);
}
gimp_context_copy_args (gimp_get_user_context (the_gimp),
gimp_context_copy_properties (gimp_get_user_context (the_gimp),
temp_context,
GIMP_CONTEXT_ALL_ARGS_MASK);
gimp_context_copy_args (swap_context,
GIMP_CONTEXT_ALL_PROPS_MASK);
gimp_context_copy_properties (swap_context,
gimp_get_user_context (the_gimp),
GIMP_CONTEXT_ALL_ARGS_MASK);
gimp_context_copy_args (temp_context,
GIMP_CONTEXT_ALL_PROPS_MASK);
gimp_context_copy_properties (temp_context,
swap_context,
GIMP_CONTEXT_ALL_ARGS_MASK);
GIMP_CONTEXT_ALL_PROPS_MASK);
}
void

10
app/tools/tool_manager.c
View File

@ -122,7 +122,7 @@ tool_manager_init (Gimp *gimp)
user_context);
/* TODO: add foreground, background, brush, pattern, gradient */
gimp_context_define_args (tool_manager->global_tool_context,
gimp_context_define_properties (tool_manager->global_tool_context,
PAINT_OPTIONS_MASK, FALSE);
/* register internal tools */
@ -190,7 +190,7 @@ tool_manager_set_global_paint_options (Gimp *gimp,
gimp_context_unset_parent (tool_info->context);
}
gimp_context_copy_args (tool_manager->global_tool_context,
gimp_context_copy_properties (tool_manager->global_tool_context,
gimp_get_user_context (gimp),
PAINT_OPTIONS_MASK);
gimp_context_set_parent (tool_manager->global_tool_context,
@ -202,9 +202,9 @@ tool_manager_set_global_paint_options (Gimp *gimp,
if (tool_info && tool_info->context)
{
gimp_context_copy_args (tool_info->context,
gimp_context_copy_properties (tool_info->context,
gimp_get_user_context (gimp),
GIMP_CONTEXT_PAINT_ARGS_MASK);
GIMP_CONTEXT_PAINT_PROPS_MASK);
gimp_context_set_parent (tool_info->context,
gimp_get_user_context (gimp));
}
@ -686,7 +686,7 @@ tool_manager_tool_changed (GimpContext *user_context,
if ((tool_context = tool_info->context))
{
gimp_context_copy_args (tool_context, user_context,
gimp_context_copy_properties (tool_context, user_context,
PAINT_OPTIONS_MASK);
gimp_context_set_parent (tool_context, user_context);
}

14
app/widgets/gimpdeviceinfo.c
View File

@ -267,10 +267,10 @@ devices_init (void)
device_info->context = gimp_create_context (the_gimp,
device_info->name, NULL);
gimp_context_define_args (device_info->context,
gimp_context_define_properties (device_info->context,
DEVICE_CONTEXT_MASK,
FALSE);
gimp_context_copy_args (gimp_get_user_context (the_gimp),
gimp_context_copy_properties (gimp_get_user_context (the_gimp),
device_info->context,
DEVICE_CONTEXT_MASK);
device_status_context_connect (device_info->context,
@ -299,7 +299,8 @@ devices_restore (void)
context = gimp_get_user_context (the_gimp);
gimp_context_copy_args (device_info->context, context, DEVICE_CONTEXT_MASK);
gimp_context_copy_properties (device_info->context, context,
DEVICE_CONTEXT_MASK);
gimp_context_set_parent (device_info->context, context);
suppress_update = FALSE;
@ -364,10 +365,10 @@ devices_rc_update (gchar *name,
device_info->context = gimp_create_context (the_gimp,
device_info->name, NULL);
gimp_context_define_args (device_info->context,
gimp_context_define_properties (device_info->context,
DEVICE_CONTEXT_MASK,
FALSE);
gimp_context_copy_args (gimp_get_user_context (the_gimp),
gimp_context_copy_properties (gimp_get_user_context (the_gimp),
device_info->context,
DEVICE_CONTEXT_MASK);
device_status_context_connect (device_info->context,
@ -523,7 +524,8 @@ select_device (GdkDevice *new_device)
context = gimp_get_user_context (the_gimp);
gimp_context_copy_args (device_info->context, context, DEVICE_CONTEXT_MASK);
gimp_context_copy_properties (device_info->context, context,
DEVICE_CONTEXT_MASK);
gimp_context_set_parent (device_info->context, context);
suppress_update = FALSE;

14
app/widgets/gimpdevices.c
View File

@ -267,10 +267,10 @@ devices_init (void)
device_info->context = gimp_create_context (the_gimp,
device_info->name, NULL);
gimp_context_define_args (device_info->context,
gimp_context_define_properties (device_info->context,
DEVICE_CONTEXT_MASK,
FALSE);
gimp_context_copy_args (gimp_get_user_context (the_gimp),
gimp_context_copy_properties (gimp_get_user_context (the_gimp),
device_info->context,
DEVICE_CONTEXT_MASK);
device_status_context_connect (device_info->context,
@ -299,7 +299,8 @@ devices_restore (void)
context = gimp_get_user_context (the_gimp);
gimp_context_copy_args (device_info->context, context, DEVICE_CONTEXT_MASK);
gimp_context_copy_properties (device_info->context, context,
DEVICE_CONTEXT_MASK);
gimp_context_set_parent (device_info->context, context);
suppress_update = FALSE;
@ -364,10 +365,10 @@ devices_rc_update (gchar *name,
device_info->context = gimp_create_context (the_gimp,
device_info->name, NULL);
gimp_context_define_args (device_info->context,
gimp_context_define_properties (device_info->context,
DEVICE_CONTEXT_MASK,
FALSE);
gimp_context_copy_args (gimp_get_user_context (the_gimp),
gimp_context_copy_properties (gimp_get_user_context (the_gimp),
device_info->context,
DEVICE_CONTEXT_MASK);
device_status_context_connect (device_info->context,
@ -523,7 +524,8 @@ select_device (GdkDevice *new_device)
context = gimp_get_user_context (the_gimp);
gimp_context_copy_args (device_info->context, context, DEVICE_CONTEXT_MASK);
gimp_context_copy_properties (device_info->context, context,
DEVICE_CONTEXT_MASK);
gimp_context_set_parent (device_info->context, context);
suppress_update = FALSE;

8
app/widgets/gimpimagedock.c
View File

@ -174,16 +174,16 @@ gimp_image_dock_new (GimpDialogFactory *factory,
dock->context = gimp_create_context (factory->context->gimp,
"Dock Context", NULL);
gimp_context_define_args (dock->context,
GIMP_CONTEXT_ALL_ARGS_MASK &
gimp_context_define_properties (dock->context,
GIMP_CONTEXT_ALL_PROPS_MASK &
~(GIMP_CONTEXT_IMAGE_MASK |
GIMP_CONTEXT_DISPLAY_MASK),
FALSE);
gimp_context_set_parent (dock->context, factory->context);
if (image_dock->auto_follow_active)
gimp_context_copy_arg (factory->context, dock->context,
GIMP_CONTEXT_ARG_IMAGE);
gimp_context_copy_property (factory->context, dock->context,
GIMP_CONTEXT_PROP_IMAGE);
g_signal_connect_object (G_OBJECT (factory->context), "image_changed",
G_CALLBACK (gimp_image_dock_factory_image_changed),

8
app/widgets/gimpmenudock.c
View File

@ -174,16 +174,16 @@ gimp_image_dock_new (GimpDialogFactory *factory,
dock->context = gimp_create_context (factory->context->gimp,
"Dock Context", NULL);
gimp_context_define_args (dock->context,
GIMP_CONTEXT_ALL_ARGS_MASK &
gimp_context_define_properties (dock->context,
GIMP_CONTEXT_ALL_PROPS_MASK &
~(GIMP_CONTEXT_IMAGE_MASK |
GIMP_CONTEXT_DISPLAY_MASK),
FALSE);
gimp_context_set_parent (dock->context, factory->context);
if (image_dock->auto_follow_active)
gimp_context_copy_arg (factory->context, dock->context,
GIMP_CONTEXT_ARG_IMAGE);
gimp_context_copy_property (factory->context, dock->context,
GIMP_CONTEXT_PROP_IMAGE);
g_signal_connect_object (G_OBJECT (factory->context), "image_changed",
G_CALLBACK (gimp_image_dock_factory_image_changed),

13
configure.in
View File

@ -129,12 +129,14 @@ if test -z "$GLIB_LDFLAGS" ; then
fi
GLIB_LIBS="$GLIB_LDFLAGS `echo $GTK_LIBS | sed 's/^.*\(-lglib[^ ]*\).*$/\1/'`"
#
# Check for PangoFT2
#
changequote([,])dnl
dnl
dnl Check for PangoFT2
dnl
PANGOFT2_REQUIRED_VERSION=0.17
AC_MSG_CHECKING(for Freetype 2.0 font support for Pango)
AC_MSG_CHECKING([for Freetype 2.0 font support for Pango])
if $PKG_CONFIG --atleast-version $PANGOFT2_REQUIRED_VERSION pangoft2; then
AC_MSG_RESULT(found)
PANGOFT2_CFLAGS=`$PKG_CONFIG --cflags pangoft2`
@ -143,7 +145,6 @@ AC_MSG_CHECKING(for Freetype 2.0 font support for Pango)
AC_MSG_ERROR([*** PangoFT2 $PANGOFT2_REQUIRED_VERSION or newer is required.])
fi
if eval "test x$GCC = xyes"; then
case " $CFLAGS " in
*[\ \ ]-Wall[\ \ ]*) ;;
@ -163,8 +164,6 @@ if eval "test x$GCC = xyes"; then
fi
fi
changequote([,])dnl
AC_CHECK_HEADERS(math.h ieeefp.h)
dnl DU4 native cc currently needs -std1 for ANSI mode (instead of K&R)