diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-09-19 20:52:42 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-09-19 20:52:42 +0000 |
| commit | 3f5ad7890fa10ec4811e9e1add99e131f1728524 (patch) | |
| tree | d8bb1916dcc8437c1ec70826eef9e34a9f465cd7 /gtk/gtksettings.h | |
| parent | 1e3c6144b40aeae501ef6c8c28110bdaa9ba3957 (diff) | |
| download | gdk-pixbuf-3f5ad7890fa10ec4811e9e1add99e131f1728524.tar.gz | |
Fix usage of compat GTK_TYPE_ macros without including gtkobject.h.
Thu Sep 19 16:39:29 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtksettings.h (GTK_SETTINGS_GET_CLASS): Fix
usage of compat GTK_TYPE_ macros without including
gtkobject.h.
* gdk/x11/gdkevents-x11.[ch]: Set a flag when initializing
to avoid having extra settings-notify events sent
when not needed.
Diffstat (limited to 'gtk/gtksettings.h')
| -rw-r--r-- | gtk/gtksettings.h | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/gtk/gtksettings.h b/gtk/gtksettings.h index 4e0864d24..98f83cdb2 100644 --- a/gtk/gtksettings.h +++ b/gtk/gtksettings.h @@ -20,18 +20,16 @@ #include <gtk/gtkrc.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS /* -- type macros --- */ -#define GTK_TYPE_SETTINGS (gtk_settings_get_type ()) -#define GTK_SETTINGS(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_SETTINGS, GtkSettings)) -#define GTK_SETTINGS_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_SETTINGS, GtkSettingsClass)) -#define GTK_IS_SETTINGS(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_SETTINGS)) -#define GTK_IS_SETTINGS_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SETTINGS)) -#define GTK_SETTINGS_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_SETTINGS, GtkSettingsClass)) +#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 --- */ @@ -124,8 +122,6 @@ gboolean _gtk_settings_parse_convert (GtkRcPropertyParser parser, GValue *dest_value); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __GTK_SETTINGS_H__ */ |