Refactor: DECLARE_FINAL GOCharmapSel < GtkBox

This commit is contained in:
Richard Cohen 2023-05-20 13:29:53 +01:00
parent fa3043a631
commit 02a9cf6ec3
2 changed files with 2 additions and 15 deletions

View File

@ -261,15 +261,6 @@ struct _GOCharmapSel
GOCharmapSelTestDirection test; GOCharmapSelTestDirection test;
}; };
typedef struct
{
GtkBoxClass parent_class;
gboolean (*charmap_changed)(GOCharmapSel *cs, char const *new_charmap);
} GOCharmapSelClass;
typedef GOCharmapSel Cs;
typedef GOCharmapSelClass CsClass;
/* Signals we emit */ /* Signals we emit */
enum enum
@ -471,7 +462,7 @@ static void go_charmap_sel_class_init(GOCharmapSelClass *klass)
cs_signals[CHARMAP_CHANGED] = g_signal_new("charmap_changed", cs_signals[CHARMAP_CHANGED] = g_signal_new("charmap_changed",
GO_TYPE_CHARMAP_SEL, G_SIGNAL_RUN_LAST, GO_TYPE_CHARMAP_SEL, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(GOCharmapSelClass, charmap_changed), 0,
NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1,
G_TYPE_POINTER); G_TYPE_POINTER);

View File

@ -30,10 +30,7 @@
G_BEGIN_DECLS G_BEGIN_DECLS
#define GO_TYPE_CHARMAP_SEL (go_charmap_sel_get_type ()) #define GO_TYPE_CHARMAP_SEL (go_charmap_sel_get_type ())
#define GO_CHARMAP_SEL(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GO_TYPE_CHARMAP_SEL, GOCharmapSel)) G_DECLARE_FINAL_TYPE (GOCharmapSel, go_charmap_sel, GO, CHARMAP_SEL, GtkBox);
#define GO_IS_CHARMAP_SEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GO_TYPE_CHARMAP_SEL))
typedef struct _GOCharmapSel GOCharmapSel;
typedef enum typedef enum
{ {
@ -41,7 +38,6 @@ typedef enum
GO_CHARMAP_SEL_FROM_UTF8 GO_CHARMAP_SEL_FROM_UTF8
} GOCharmapSelTestDirection; } GOCharmapSelTestDirection;
GType go_charmap_sel_get_type(void);
GtkWidget * go_charmap_sel_new(GOCharmapSelTestDirection test); GtkWidget * go_charmap_sel_new(GOCharmapSelTestDirection test);
gchar const *go_charmap_sel_get_encoding(GOCharmapSel *cs); gchar const *go_charmap_sel_get_encoding(GOCharmapSel *cs);