diff options
| author | Darin Adler <darin@src.gnome.org> | 2001-07-31 20:12:01 +0000 |
|---|---|---|
| committer | Darin Adler <darin@src.gnome.org> | 2001-07-31 20:12:01 +0000 |
| commit | 6fe3d87b10596806abadffadde6a3e91edd98fe4 (patch) | |
| tree | b32f727affc06f99e4142385ec5d3c6578af225c /gdk/gdkprivate.h | |
| parent | 3538aeef4348babc22805cdd7aa4eb32271ead8e (diff) | |
| download | gtk+-6fe3d87b10596806abadffadde6a3e91edd98fe4.tar.gz | |
Put all mentions of GdkFont inside #ifndef GDK_DISABLE_DEPRECATED.
* gdk/gdkprivate.h:
* gdk/x11/gdkx.h:
Put all mentions of GdkFont inside #ifndef GDK_DISABLE_DEPRECATED.
* demos/gtk-demo/menus.c: (do_menus): Cast to G_OBJECT, not
GTK_OBJECT.
Diffstat (limited to 'gdk/gdkprivate.h')
| -rw-r--r-- | gdk/gdkprivate.h | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/gdk/gdkprivate.h b/gdk/gdkprivate.h index c8799541c0..1bc8cc8626 100644 --- a/gdk/gdkprivate.h +++ b/gdk/gdkprivate.h @@ -36,9 +36,7 @@ #include <gdk/gdkvisual.h> #include <gdk/gdkwindow.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GDK_PARENT_RELATIVE_BG ((GdkPixmap *)1L) #define GDK_NO_BG ((GdkPixmap *)2L) @@ -47,16 +45,9 @@ extern "C" { #define GDK_WINDOW_DESTROYED(d) (((GdkWindowObject*)(GDK_WINDOW (d)))->destroyed) typedef struct _GdkColorInfo GdkColorInfo; -typedef struct _GdkFontPrivate GdkFontPrivate; typedef struct _GdkEventFilter GdkEventFilter; typedef struct _GdkClientFilter GdkClientFilter; -struct _GdkFontPrivate -{ - GdkFont font; - guint ref_count; -}; - typedef enum { GDK_COLOR_WRITEABLE = 1 << 0 } GdkColorInfoFlags; @@ -84,14 +75,18 @@ GDKVAR GdkWindow *gdk_parent_root; GDKVAR gint gdk_error_code; GDKVAR gint gdk_error_warnings; -#ifdef __cplusplus -} -#endif /* __cplusplus */ - - -#endif /* __GDK_PRIVATE_H__ */ +#ifndef GDK_DISABLE_DEPRECATED +typedef struct _GdkFontPrivate GdkFontPrivate; +struct _GdkFontPrivate +{ + GdkFont font; + guint ref_count; +}; +#endif /* GDK_DISABLE_DEPRECATED */ +G_END_DECLS +#endif /* __GDK_PRIVATE_H__ */ |