[gtk] settings: Make not subclassable
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk] settings: Make not subclassable
- Date: Sun, 19 May 2019 20:05:11 +0000 (UTC)
commit f6dc6bed07c09aabf4136cf4ec4743b6e57e197d
Author: Matthias Clasen <mclasen redhat com>
Date: Sun May 19 15:13:19 2019 -0400
settings: Make not subclassable
Part of being more explicit about what
we allow to be subclassed and what not.
gtk/gtksettings.c | 11 +++++++++++
gtk/gtksettings.h | 14 --------------
2 files changed, 11 insertions(+), 14 deletions(-)
---
diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index 43d067a7af..e14818f5c7 100644
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -100,6 +100,17 @@
#define DEFAULT_TIMEOUT_REPEAT 50
#define DEFAULT_TIMEOUT_EXPAND 500
+struct _GtkSettingsClass
+{
+ GObjectClass parent_class;
+
+ /* Padding for future expansion */
+ void (*_gtk_reserved1) (void);
+ void (*_gtk_reserved2) (void);
+ void (*_gtk_reserved3) (void);
+ void (*_gtk_reserved4) (void);
+};
+
typedef struct _GtkSettingsPropertyValue GtkSettingsPropertyValue;
typedef struct _GtkSettingsValuePrivate GtkSettingsValuePrivate;
diff --git a/gtk/gtksettings.h b/gtk/gtksettings.h
index 9b1b41d93d..dbf007c1d4 100644
--- a/gtk/gtksettings.h
+++ b/gtk/gtksettings.h
@@ -31,10 +31,7 @@ G_BEGIN_DECLS
/* -- type macros --- */
#define GTK_TYPE_SETTINGS (gtk_settings_get_type ())
#define GTK_SETTINGS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SETTINGS, GtkSettings))
-#define GTK_SETTINGS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SETTINGS,
GtkSettingsClass))
#define GTK_IS_SETTINGS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SETTINGS))
-#define GTK_IS_SETTINGS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SETTINGS))
-#define GTK_SETTINGS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SETTINGS,
GtkSettingsClass))
/* --- typedefs --- */
@@ -52,17 +49,6 @@ struct _GtkSettings
GtkSettingsPrivate *priv;
};
-struct _GtkSettingsClass
-{
- GObjectClass parent_class;
-
- /* Padding for future expansion */
- void (*_gtk_reserved1) (void);
- void (*_gtk_reserved2) (void);
- void (*_gtk_reserved3) (void);
- void (*_gtk_reserved4) (void);
-};
-
/**
* GtkSettingsValue:
* @origin: Origin should be something like “filename:linenumber” for
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]