Merge libgdk and libgtk

[~andy/gtk] / modules / input / gtkimcontextxim.h

diff --git a/modules/input/gtkimcontextxim.h b/modules/input/gtkimcontextxim.h
index d8c31f75ce1177fc7f62e405c357066622c17c39..66dab9c6d2a9e961d280f1d4cf7945bddd2b0333 100644 (file)
--- a/modules/input/gtkimcontextxim.h
+++ b/modules/input/gtkimcontextxim.h
@@ -20,62 +20,24 @@
 #ifndef __GTK_IM_CONTEXT_XIM_H__
 #define __GTK_IM_CONTEXT_XIM_H__
 
-#include <gtk/gtkimcontext.h>
+#include <gtk/gtk.h>
 #include "x11/gdkx.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+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;
 typedef struct _GtkIMContextXIMClass  GtkIMContextXIMClass;
 
-typedef struct _GtkXIMInfo GtkXIMInfo;
-
-struct _GtkIMContextXIM
-{
-  GtkIMContext object;
-
-  GtkXIMInfo *im_info;
-
-  gchar *locale;
-  gchar *mb_charset;
-
-  GdkWindow *client_window;
-
-  gint preedit_size;
-  gint preedit_length;
-  gunichar *preedit_chars;
-  XIMFeedback *feedbacks;
-
-  gint preedit_cursor;
-  
-  XIMCallback preedit_start_callback;
-  XIMCallback preedit_done_callback;
-  XIMCallback preedit_draw_callback;
-  XIMCallback preedit_caret_callback;
-
-  XIMCallback status_start_callback;
-  XIMCallback status_done_callback;
-  XIMCallback status_draw_callback;
-
-  XIC ic;
-
-  guint use_preedit : 1;
-  guint status_visible : 1;
-};
-
 struct _GtkIMContextXIMClass
 {
   GtkIMContextClass parent_class;
@@ -84,9 +46,8 @@ struct _GtkIMContextXIMClass
 void gtk_im_context_xim_register_type (GTypeModule *type_module);
 GtkIMContext *gtk_im_context_xim_new (void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+void gtk_im_context_xim_shutdown (void);
 
+G_END_DECLS
 
 #endif /* __GTK_IM_CONTEXT_XIM_H__ */