From aa2527843b70ad12f7ecf293938b01eb58e29956 Mon Sep 17 00:00:00 2001 From: Jehan Date: Sat, 28 Sep 2024 14:15:47 +0200 Subject: [PATCH] libgimp: use G_DECLARE_FINAL_TYPE() for GimpImageComboBox. --- libgimp/gimpimagecombobox.c | 10 +--------- libgimp/gimpimagecombobox.h | 11 ++++------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/libgimp/gimpimagecombobox.c b/libgimp/gimpimagecombobox.c index 669756c19e..de048dcb2b 100644 --- a/libgimp/gimpimagecombobox.c +++ b/libgimp/gimpimagecombobox.c @@ -48,8 +48,6 @@ #define WIDTH_REQUEST 200 -typedef struct _GimpImageComboBoxClass GimpImageComboBoxClass; - struct _GimpImageComboBox { GimpIntComboBox parent_instance; @@ -59,11 +57,6 @@ struct _GimpImageComboBox GDestroyNotify data_destroy; }; -struct _GimpImageComboBoxClass -{ - GimpIntComboBoxClass parent_class; -}; - static void gimp_image_combo_box_finalize (GObject *object); @@ -87,8 +80,7 @@ static void gimp_image_combo_box_changed (GimpImageComboBox *combo_box); static const GtkTargetEntry target = { "application/x-gimp-image-id", 0 }; -G_DEFINE_TYPE (GimpImageComboBox, gimp_image_combo_box, - GIMP_TYPE_INT_COMBO_BOX) +G_DEFINE_TYPE (GimpImageComboBox, gimp_image_combo_box, GIMP_TYPE_INT_COMBO_BOX) #define parent_class gimp_image_combo_box_parent_class diff --git a/libgimp/gimpimagecombobox.h b/libgimp/gimpimagecombobox.h index f5716220ce..7279d8c30d 100644 --- a/libgimp/gimpimagecombobox.h +++ b/libgimp/gimpimagecombobox.h @@ -40,15 +40,12 @@ typedef gboolean (* GimpImageConstraintFunc) (GimpImage *image, #define GIMP_TYPE_IMAGE_COMBO_BOX (gimp_image_combo_box_get_type ()) -#define GIMP_IMAGE_COMBO_BOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_IMAGE_COMBO_BOX, GimpImageComboBox)) -#define GIMP_IS_IMAGE_COMBO_BOX(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_IMAGE_COMBO_BOX) +G_DECLARE_FINAL_TYPE (GimpImageComboBox, gimp_image_combo_box, GIMP, IMAGE_COMBO_BOX, GimpIntComboBox) -GType gimp_image_combo_box_get_type (void) G_GNUC_CONST; - -GtkWidget * gimp_image_combo_box_new (GimpImageConstraintFunc constraint, - gpointer data, - GDestroyNotify data_destroy); +GtkWidget * gimp_image_combo_box_new (GimpImageConstraintFunc constraint, + gpointer data, + GDestroyNotify data_destroy); G_END_DECLS