summaryrefslogtreecommitdiff
path: root/gtk/gtkimcontext.h
diff options
context:
space:
mode:
authorManish Singh <yosh@gimp.org>2002-10-10 22:20:48 +0000
committerManish Singh <yosh@src.gnome.org>2002-10-10 22:20:48 +0000
commit5d021465d6709bc1d6a5c9fca0a7a27546e4b8f1 (patch)
tree1c398c68a3676f96b1a9f05cfadba0eba1d7fa89 /gtk/gtkimcontext.h
parent62341005d165089fd30ad3ac7b093a3d8221ccab (diff)
downloadgtk+-5d021465d6709bc1d6a5c9fca0a7a27546e4b8f1.tar.gz
Deprecation cleanup
Thu Oct 10 15:13:48 2002 Manish Singh <yosh@gimp.org> * gtk/gtkimcontext.[ch] gtk/gtkimcontextsimple.[ch] gtk/gtkimmodule.c gtk/gtkimmulticontext.[ch] gtk/gtktreestore.[ch]: Deprecation cleanup
Diffstat (limited to 'gtk/gtkimcontext.h')
-rw-r--r--gtk/gtkimcontext.h15
1 files changed, 9 insertions, 6 deletions
diff --git a/gtk/gtkimcontext.h b/gtk/gtkimcontext.h
index a3ebea0263..4ca114bcbf 100644
--- a/gtk/gtkimcontext.h
+++ b/gtk/gtkimcontext.h
@@ -30,11 +30,11 @@ extern "C" {
#endif /* __cplusplus */
#define GTK_TYPE_IM_CONTEXT (gtk_im_context_get_type ())
-#define GTK_IM_CONTEXT(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_IM_CONTEXT, GtkIMContext))
-#define GTK_IM_CONTEXT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_IM_CONTEXT, GtkIMContextClass))
-#define GTK_IS_IM_CONTEXT(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_IM_CONTEXT))
-#define GTK_IS_IM_CONTEXT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_IM_CONTEXT))
-#define GTK_IM_CONTEXT_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_IM_CONTEXT, GtkIMContextClass))
+#define GTK_IM_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_IM_CONTEXT, GtkIMContext))
+#define GTK_IM_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_IM_CONTEXT, GtkIMContextClass))
+#define GTK_IS_IM_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_IM_CONTEXT))
+#define GTK_IS_IM_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_IM_CONTEXT))
+#define GTK_IM_CONTEXT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_IM_CONTEXT, GtkIMContextClass))
typedef struct _GtkIMContext GtkIMContext;
@@ -47,6 +47,9 @@ struct _GtkIMContext
struct _GtkIMContextClass
{
+ /* Yes, this should be GObjectClass, be we can't fix it without breaking
+ * binary compatibility - see bug #90935
+ */
GtkObjectClass parent_class;
/* Signals */
@@ -92,7 +95,7 @@ struct _GtkIMContextClass
void (*_gtk_reserved6) (void);
};
-GtkType gtk_im_context_get_type (void) G_GNUC_CONST;
+GType gtk_im_context_get_type (void) G_GNUC_CONST;
void gtk_im_context_set_client_window (GtkIMContext *context,
GdkWindow *window);