diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | modules/input/gtkimcontextmultipress.h | 21 | ||||
| -rw-r--r-- | modules/input/gtkimcontextthai.h | 12 | ||||
| -rw-r--r-- | modules/input/gtkimcontextxim.h | 13 |
4 files changed, 29 insertions, 24 deletions
@@ -1,5 +1,12 @@ 2008-06-17 Michael Natterer <mitch@imendio.com> + * modules/input/gtkimcontextmultipress.h + * modules/input/gtkimcontextthai.h + * modules/input/gtkimcontextxim.h: use G_TYPE instead of GTK_CHECK + type checking macros. + +2008-06-17 Michael Natterer <mitch@imendio.com> + * gtk/gtktypeutils.h: really move the GtkType typedef to an undeprecated section. diff --git a/modules/input/gtkimcontextmultipress.h b/modules/input/gtkimcontextmultipress.h index aa564a22e9..dee68391ff 100644 --- a/modules/input/gtkimcontextmultipress.h +++ b/modules/input/gtkimcontextmultipress.h @@ -1,5 +1,5 @@ /* Copyright (C) 2006 Openismus GmbH - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -16,19 +16,19 @@ * Boston, MA 02111-1307, USA. */ -#ifndef __GTK_IM_CONTEXT_MULTIPRESS_H -#define __GTK_IM_CONTEXT_MULTIPRESS_H +#ifndef __GTK_IM_CONTEXT_MULTIPRESS_H__ +#define __GTK_IM_CONTEXT_MULTIPRESS_H__ #include <gtk/gtk.h> G_BEGIN_DECLS -#define GTK_TYPE_IM_CONTEXT_MULTIPRESS (gtk_im_context_multipress_get_type()) -#define gtk_im_context_multipress(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_IM_CONTEXT_MULTIPRESS, GtkImContextMultipress)) -#define gtk_im_context_multipress_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_IM_CONTEXT_MULTIPRESS, GtkImContextMultipressClass)) -#define GTK_IS_IM_CONTEXT_MULTIPRESS(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_IM_CONTEXT_MULTIPRESS)) -#define GTK_IS_IM_CONTEXT_MULTIPRESS_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_IM_CONTEXT_MULTIPRESS)) -#define gtk_im_context_multipress_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_IM_CONTEXT_MULTIPRESS, GtkImContextMultipressClass)) +#define GTK_TYPE_IM_CONTEXT_MULTIPRESS (gtk_im_context_multipress_get_type ()) +#define gtk_im_context_multipress(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_IM_CONTEXT_MULTIPRESS, GtkImContextMultipress)) +#define gtk_im_context_multipress_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_IM_CONTEXT_MULTIPRESS, GtkImContextMultipressClass)) +#define GTK_IS_IM_CONTEXT_MULTIPRESS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_IM_CONTEXT_MULTIPRESS)) +#define GTK_IS_IM_CONTEXT_MULTIPRESS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_IM_CONTEXT_MULTIPRESS)) +#define gtk_im_context_multipress_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_IM_CONTEXT_MULTIPRESS, GtkImContextMultipressClass)) typedef struct _KeySequence KeySequence; @@ -81,5 +81,4 @@ GtkIMContext *gtk_im_context_multipress_new (void); G_END_DECLS - -#endif /* __GTK_IM_CONTEXT_MULTIPRESS_H */ +#endif /* __GTK_IM_CONTEXT_MULTIPRESS_H__ */ diff --git a/modules/input/gtkimcontextthai.h b/modules/input/gtkimcontextthai.h index bb5faee509..fb9f3b91fc 100644 --- a/modules/input/gtkimcontextthai.h +++ b/modules/input/gtkimcontextthai.h @@ -28,12 +28,12 @@ G_BEGIN_DECLS extern GType gtk_type_im_context_thai; -#define GTK_TYPE_IM_CONTEXT_THAI gtk_type_im_context_thai -#define GTK_IM_CONTEXT_THAI(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_IM_CONTEXT_THAI, GtkIMContextThai)) -#define GTK_IM_CONTEXT_THAI_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_IM_CONTEXT_THAI, GtkIMContextThaiClass)) -#define GTK_IS_IM_CONTEXT_THAI(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_IM_CONTEXT_THAI)) -#define GTK_IS_IM_CONTEXT_THAI_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_IM_CONTEXT_THAI)) -#define GTK_IM_CONTEXT_THAI_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_IM_CONTEXT_THAI, GtkIMContextThaiClass)) +#define GTK_TYPE_IM_CONTEXT_THAI (gtk_type_im_context_thai) +#define GTK_IM_CONTEXT_THAI(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_IM_CONTEXT_THAI, GtkIMContextThai)) +#define GTK_IM_CONTEXT_THAI_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_IM_CONTEXT_THAI, GtkIMContextThaiClass)) +#define GTK_IS_IM_CONTEXT_THAI(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_IM_CONTEXT_THAI)) +#define GTK_IS_IM_CONTEXT_THAI_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_IM_CONTEXT_THAI)) +#define GTK_IM_CONTEXT_THAI_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_IM_CONTEXT_THAI, GtkIMContextThaiClass)) typedef struct _GtkIMContextThai GtkIMContextThai; diff --git a/modules/input/gtkimcontextxim.h b/modules/input/gtkimcontextxim.h index 36c77cd2ef..66dab9c6d2 100644 --- a/modules/input/gtkimcontextxim.h +++ b/modules/input/gtkimcontextxim.h @@ -27,12 +27,12 @@ G_BEGIN_DECLS extern GType gtk_type_im_context_xim; -#define GTK_TYPE_IM_CONTEXT_XIM gtk_type_im_context_xim -#define GTK_IM_CONTEXT_XIM(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_IM_CONTEXT_XIM, GtkIMContextXIM)) -#define GTK_IM_CONTEXT_XIM_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_IM_CONTEXT_XIM, GtkIMContextXIMClass)) -#define GTK_IS_IM_CONTEXT_XIM(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_IM_CONTEXT_XIM)) -#define GTK_IS_IM_CONTEXT_XIM_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_IM_CONTEXT_XIM)) -#define GTK_IM_CONTEXT_XIM_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_IM_CONTEXT_XIM, GtkIMContextXIMClass)) +#define GTK_TYPE_IM_CONTEXT_XIM (gtk_type_im_context_xim) +#define GTK_IM_CONTEXT_XIM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_IM_CONTEXT_XIM, GtkIMContextXIM)) +#define GTK_IM_CONTEXT_XIM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_IM_CONTEXT_XIM, GtkIMContextXIMClass)) +#define GTK_IS_IM_CONTEXT_XIM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_IM_CONTEXT_XIM)) +#define GTK_IS_IM_CONTEXT_XIM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_IM_CONTEXT_XIM)) +#define GTK_IM_CONTEXT_XIM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_IM_CONTEXT_XIM, GtkIMContextXIMClass)) typedef struct _GtkIMContextXIM GtkIMContextXIM; @@ -50,5 +50,4 @@ void gtk_im_context_xim_shutdown (void); G_END_DECLS - #endif /* __GTK_IM_CONTEXT_XIM_H__ */ |