[gimp] libgimpwidgets: implement GObject::dispose() instead of GtkObject::destroy()
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] libgimpwidgets: implement GObject::dispose() instead of GtkObject::destroy()
- Date: Fri, 15 Oct 2010 00:08:20 +0000 (UTC)
commit 6a10ded2217f5098f2741aa92cdbdf5c9ad5f4c9
Author: Michael Natterer <mitch gimp org>
Date: Fri Oct 15 02:07:55 2010 +0200
libgimpwidgets: implement GObject::dispose() instead of GtkObject::destroy()
libgimpwidgets/gimpcolorbutton.c | 69 ++++++++++++++++++--------------------
1 files changed, 33 insertions(+), 36 deletions(-)
---
diff --git a/libgimpwidgets/gimpcolorbutton.c b/libgimpwidgets/gimpcolorbutton.c
index 32c5437..3d497d4 100644
--- a/libgimpwidgets/gimpcolorbutton.c
+++ b/libgimpwidgets/gimpcolorbutton.c
@@ -90,6 +90,8 @@ static void gimp_color_button_class_init (GimpColorButtonClass *klass);
static void gimp_color_button_init (GimpColorButton *button,
GimpColorButtonClass *klass);
+static void gimp_color_button_finalize (GObject *object);
+static void gimp_color_button_dispose (GObject *object);
static void gimp_color_button_get_property (GObject *object,
guint property_id,
GValue *value,
@@ -98,9 +100,6 @@ static void gimp_color_button_set_property (GObject *object,
guint property_id,
const GValue *value,
GParamSpec *pspec);
-static void gimp_color_button_finalize (GObject *object);
-
-static void gimp_color_button_destroy (GtkObject *object);
static gboolean gimp_color_button_button_press (GtkWidget *widget,
GdkEventButton *bevent);
@@ -183,10 +182,9 @@ gimp_color_button_get_type (void)
static void
gimp_color_button_class_init (GimpColorButtonClass *klass)
{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
- GtkObjectClass *gtk_object_class = GTK_OBJECT_CLASS (klass);
- GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
- GtkButtonClass *button_class = GTK_BUTTON_CLASS (klass);
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+ GtkButtonClass *button_class = GTK_BUTTON_CLASS (klass);
GimpRGB color;
parent_class = g_type_class_peek_parent (klass);
@@ -200,11 +198,10 @@ gimp_color_button_class_init (GimpColorButtonClass *klass)
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
+ object_class->finalize = gimp_color_button_finalize;
+ object_class->dispose = gimp_color_button_dispose;
object_class->get_property = gimp_color_button_get_property;
object_class->set_property = gimp_color_button_set_property;
- object_class->finalize = gimp_color_button_finalize;
-
- gtk_object_class->destroy = gimp_color_button_destroy;
widget_class->button_press_event = gimp_color_button_button_press;
widget_class->state_changed = gimp_color_button_state_changed;
@@ -351,6 +348,32 @@ gimp_color_button_finalize (GObject *object)
}
static void
+gimp_color_button_dispose (GObject *object)
+{
+ GimpColorButton *button = GIMP_COLOR_BUTTON (object);
+
+ if (button->dialog)
+ {
+ gtk_widget_destroy (button->dialog);
+ button->dialog = NULL;
+ }
+
+ if (button->color_area)
+ {
+ gtk_widget_destroy (button->color_area);
+ button->color_area = NULL;
+ }
+
+ if (button->popup_menu)
+ {
+ g_object_unref (button->popup_menu);
+ button->popup_menu = NULL;
+ }
+
+ G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
gimp_color_button_get_property (GObject *object,
guint property_id,
GValue *value,
@@ -415,32 +438,6 @@ gimp_color_button_set_property (GObject *object,
}
}
-static void
-gimp_color_button_destroy (GtkObject *object)
-{
- GimpColorButton *button = GIMP_COLOR_BUTTON (object);
-
- if (button->dialog)
- {
- gtk_widget_destroy (button->dialog);
- button->dialog = NULL;
- }
-
- if (button->color_area)
- {
- gtk_widget_destroy (button->color_area);
- button->color_area = NULL;
- }
-
- if (button->popup_menu)
- {
- g_object_unref (button->popup_menu);
- button->popup_menu = NULL;
- }
-
- GTK_OBJECT_CLASS (parent_class)->destroy (object);
-}
-
static gboolean
gimp_color_button_button_press (GtkWidget *widget,
GdkEventButton *bevent)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]