From f79b5dadbb3389c3cb3a0f1b578d817faee3746d Mon Sep 17 00:00:00 2001 From: David Boddie Date: Tue, 9 Jul 2019 00:41:25 +0200 Subject: [PATCH] Use a macro to declare a type with private data --- eek/eek-keyboard.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/eek/eek-keyboard.c b/eek/eek-keyboard.c index cbfca496..d67a13da 100644 --- a/eek/eek-keyboard.c +++ b/eek/eek-keyboard.c @@ -55,8 +55,6 @@ enum { static guint signals[LAST_SIGNAL] = { 0, }; -G_DEFINE_TYPE (EekKeyboard, eek_keyboard, EEK_TYPE_CONTAINER); - #define EEK_KEYBOARD_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEK_TYPE_KEYBOARD, EekKeyboardPrivate)) @@ -75,6 +73,8 @@ struct _EekKeyboardPrivate EekModifierType alt_gr_mask; }; +G_DEFINE_TYPE_WITH_PRIVATE (EekKeyboard, eek_keyboard, EEK_TYPE_CONTAINER); + G_DEFINE_BOXED_TYPE(EekModifierKey, eek_modifier_key, eek_modifier_key_copy, eek_modifier_key_free); @@ -390,9 +390,6 @@ eek_keyboard_class_init (EekKeyboardClass *klass) GObjectClass *gobject_class = G_OBJECT_CLASS (klass); GParamSpec *pspec; - g_type_class_add_private (gobject_class, - sizeof (EekKeyboardPrivate)); - klass->create_section = eek_keyboard_real_create_section; /* signals */