From d63a6e2ea93a22f8eb1b93413679ce91f864d36c Mon Sep 17 00:00:00 2001 From: Christoph Holtermann Date: Fri, 7 Dec 2018 11:06:14 +0100 Subject: [PATCH] use G_DEFINE_TYPE_WITH_PRIVATE to replace g_type_class_add_private gnc_currency_edit_get_type is being replaced by that provided by G_DEFINE_TYPE_WITH_PRIVATE --- gnucash/gnome-utils/gnc-currency-edit.c | 35 +------------------------ 1 file changed, 1 insertion(+), 34 deletions(-) diff --git a/gnucash/gnome-utils/gnc-currency-edit.c b/gnucash/gnome-utils/gnc-currency-edit.c index f956d1fb59..4a088db191 100644 --- a/gnucash/gnome-utils/gnc-currency-edit.c +++ b/gnucash/gnome-utils/gnc-currency-edit.c @@ -96,37 +96,6 @@ typedef struct _GNCCurrencyEditPrivate /** @name Basic Object Implementation */ /** @{ */ -/* Return the GType for the GNCCurrencyEdit currency selection widget. - */ -GType -gnc_currency_edit_get_type (void) -{ - static GType currency_edit_type = 0; - - if (currency_edit_type == 0) - { - static const GTypeInfo currency_edit_info = - { - sizeof (GNCCurrencyEditClass), - NULL, - NULL, - (GClassInitFunc) gnc_currency_edit_class_init, - NULL, - NULL, - sizeof (GNCCurrencyEdit), - 0, /* n_preallocs */ - (GInstanceInitFunc) gnc_currency_edit_init, - NULL - }; - - currency_edit_type = g_type_register_static (GTK_TYPE_COMBO_BOX, - "GNCCurrencyEdit", - ¤cy_edit_info, 0); - } - - return currency_edit_type; -} - enum { PROP_0, @@ -185,7 +154,7 @@ gnc_currency_edit_get_property (GObject *object, } - +G_DEFINE_TYPE_WITH_PRIVATE(GNCCurrencyEdit, gnc_currency_edit, GTK_TYPE_COMBO_BOX) /** Initialize the GncCurrencyEdit class object. * @@ -199,8 +168,6 @@ gnc_currency_edit_class_init (GNCCurrencyEditClass *klass) GObjectClass *gobject_class = G_OBJECT_CLASS (klass); parent_class = g_type_class_peek_parent (klass); - g_type_class_add_private(klass, sizeof(GNCCurrencyEditPrivate)); - gobject_class->set_property = gnc_currency_edit_set_property; gobject_class->get_property = gnc_currency_edit_get_property; gobject_class->finalize = gnc_currency_edit_finalize;