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

libgimp: implement GObject::dispose() instead of GtkObject::destroy()

This commit is contained in:
Michael Natterer 2010-10-15 12:04:36 +02:00
parent 47c6b25f23
commit 38999b7dd4
2 changed files with 51 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
libgimp/gimpaspectpreview.c
View File

@ -57,8 +57,7 @@ typedef struct
static GObject * gimp_aspect_preview_constructor (GType type, static GObject * gimp_aspect_preview_constructor (GType type,
guint n_params, guint n_params,
GObjectConstructParam *params); GObjectConstructParam *params);
static void gimp_aspect_preview_dispose (GObject *object);
static void gimp_aspect_preview_get_property (GObject *object, static void gimp_aspect_preview_get_property (GObject *object,
guint property_id, guint property_id,
GValue *value, GValue *value,
@ -67,7 +66,7 @@ static void gimp_aspect_preview_set_property (GObject *object,
guint property_id, guint property_id,
const GValue *value, const GValue *value,
GParamSpec *pspec); GParamSpec *pspec);
static void gimp_aspect_preview_destroy (GtkObject *object);
static void gimp_aspect_preview_style_set (GtkWidget *widget, static void gimp_aspect_preview_style_set (GtkWidget *widget,
GtkStyle *prev_style); GtkStyle *prev_style);
static void gimp_aspect_preview_draw (GimpPreview *preview); static void gimp_aspect_preview_draw (GimpPreview *preview);
@ -100,16 +99,14 @@ static void
gimp_aspect_preview_class_init (GimpAspectPreviewClass *klass) gimp_aspect_preview_class_init (GimpAspectPreviewClass *klass)
{ {
GObjectClass *object_class = G_OBJECT_CLASS (klass); GObjectClass *object_class = G_OBJECT_CLASS (klass);
GtkObjectClass *gtk_object_class = GTK_OBJECT_CLASS (klass);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
GimpPreviewClass *preview_class = GIMP_PREVIEW_CLASS (klass); GimpPreviewClass *preview_class = GIMP_PREVIEW_CLASS (klass);
object_class->constructor = gimp_aspect_preview_constructor; object_class->constructor = gimp_aspect_preview_constructor;
object_class->dispose = gimp_aspect_preview_dispose;
object_class->get_property = gimp_aspect_preview_get_property; object_class->get_property = gimp_aspect_preview_get_property;
object_class->set_property = gimp_aspect_preview_set_property; object_class->set_property = gimp_aspect_preview_set_property;
gtk_object_class->destroy = gimp_aspect_preview_destroy;
widget_class->style_set = gimp_aspect_preview_style_set; widget_class->style_set = gimp_aspect_preview_style_set;
preview_class->draw = gimp_aspect_preview_draw; preview_class->draw = gimp_aspect_preview_draw;
@ -163,6 +160,25 @@ gimp_aspect_preview_constructor (GType type,
return object; return object;
} }
static void
gimp_aspect_preview_dispose (GObject *object)
{
const gchar *data_name = g_object_get_data (G_OBJECT (object),
"gimp-aspect-preview-data-name");
if (data_name)
{
GimpPreview *preview = GIMP_PREVIEW (object);
PreviewSettings settings;
settings.update = gimp_preview_get_update (preview);
gimp_set_data (data_name, &settings, sizeof (PreviewSettings));
}
G_OBJECT_CLASS (parent_class)->dispose (object);
}
static void static void
gimp_aspect_preview_get_property (GObject *object, gimp_aspect_preview_get_property (GObject *object,
guint property_id, guint property_id,
@ -204,25 +220,6 @@ gimp_aspect_preview_set_property (GObject *object,
} }
} }
static void
gimp_aspect_preview_destroy (GtkObject *object)
{
const gchar *data_name = g_object_get_data (G_OBJECT (object),
"gimp-aspect-preview-data-name");
if (data_name)
{
GimpPreview *preview = GIMP_PREVIEW (object);
PreviewSettings settings;
settings.update = gimp_preview_get_update (preview);
gimp_set_data (data_name, &settings, sizeof (PreviewSettings));
}
GTK_OBJECT_CLASS (parent_class)->destroy (object);
}
static void static void
gimp_aspect_preview_style_set (GtkWidget *widget, gimp_aspect_preview_style_set (GtkWidget *widget,
GtkStyle *prev_style) GtkStyle *prev_style)

49
libgimp/gimpdrawablepreview.c
View File

@ -59,7 +59,7 @@ typedef struct
static GObject * gimp_drawable_preview_constructor (GType type, static GObject * gimp_drawable_preview_constructor (GType type,
guint n_params, guint n_params,
GObjectConstructParam *params); GObjectConstructParam *params);
static void gimp_drawable_preview_dispose (GObject *object);
static void gimp_drawable_preview_get_property (GObject *object, static void gimp_drawable_preview_get_property (GObject *object,
guint property_id, guint property_id,
GValue *value, GValue *value,
@ -68,7 +68,6 @@ static void gimp_drawable_preview_set_property (GObject *object,
guint property_id, guint property_id,
const GValue *value, const GValue *value,
GParamSpec *pspec); GParamSpec *pspec);
static void gimp_drawable_preview_destroy (GtkObject *object);
static void gimp_drawable_preview_style_set (GtkWidget *widget, static void gimp_drawable_preview_style_set (GtkWidget *widget,
GtkStyle *prev_style); GtkStyle *prev_style);
@ -98,16 +97,14 @@ static void
gimp_drawable_preview_class_init (GimpDrawablePreviewClass *klass) gimp_drawable_preview_class_init (GimpDrawablePreviewClass *klass)
{ {
GObjectClass *object_class = G_OBJECT_CLASS (klass); GObjectClass *object_class = G_OBJECT_CLASS (klass);
GtkObjectClass *gtk_object_class = GTK_OBJECT_CLASS (klass);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
GimpPreviewClass *preview_class = GIMP_PREVIEW_CLASS (klass); GimpPreviewClass *preview_class = GIMP_PREVIEW_CLASS (klass);
object_class->constructor = gimp_drawable_preview_constructor; object_class->constructor = gimp_drawable_preview_constructor;
object_class->dispose = gimp_drawable_preview_dispose;
object_class->get_property = gimp_drawable_preview_get_property; object_class->get_property = gimp_drawable_preview_get_property;
object_class->set_property = gimp_drawable_preview_set_property; object_class->set_property = gimp_drawable_preview_set_property;
gtk_object_class->destroy = gimp_drawable_preview_destroy;
widget_class->style_set = gimp_drawable_preview_style_set; widget_class->style_set = gimp_drawable_preview_style_set;
preview_class->draw = gimp_drawable_preview_draw_original; preview_class->draw = gimp_drawable_preview_draw_original;
@ -162,6 +159,27 @@ gimp_drawable_preview_constructor (GType type,
return object; return object;
} }
static void
gimp_drawable_preview_dispose (GObject *object)
{
const gchar *data_name = g_object_get_data (G_OBJECT (object),
"gimp-drawable-preview-data-name");
if (data_name)
{
GimpPreview *preview = GIMP_PREVIEW (object);
PreviewSettings settings;
settings.x = preview->xoff + preview->xmin;
settings.y = preview->yoff + preview->ymin;
settings.update = gimp_preview_get_update (preview);
gimp_set_data (data_name, &settings, sizeof (PreviewSettings));
}
G_OBJECT_CLASS (parent_class)->dispose (object);
}
static void static void
gimp_drawable_preview_get_property (GObject *object, gimp_drawable_preview_get_property (GObject *object,
guint property_id, guint property_id,
@ -204,27 +222,6 @@ gimp_drawable_preview_set_property (GObject *object,
} }
} }
static void
gimp_drawable_preview_destroy (GtkObject *object)
{
const gchar *data_name = g_object_get_data (G_OBJECT (object),
"gimp-drawable-preview-data-name");
if (data_name)
{
GimpPreview *preview = GIMP_PREVIEW (object);
PreviewSettings settings;
settings.x = preview->xoff + preview->xmin;
settings.y = preview->yoff + preview->ymin;
settings.update = gimp_preview_get_update (preview);
gimp_set_data (data_name, &settings, sizeof (PreviewSettings));
}
GTK_OBJECT_CLASS (parent_class)->destroy (object);
}
static void static void
gimp_drawable_preview_style_set (GtkWidget *widget, gimp_drawable_preview_style_set (GtkWidget *widget,
GtkStyle *prev_style) GtkStyle *prev_style)