From 2da4df4bca66c0e85bb39f7d4a37bea64b74ba6c Mon Sep 17 00:00:00 2001
From: handa <handa>
Date: Wed, 30 Jun 2004 02:53:04 +0000
Subject: [PATCH] Include <m17n-gui.h>. (m17n_init_X): Extern it. (M17N_INIT):
 Redefine it.

---
 src/m17n-X.h |   19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/m17n-X.h b/src/m17n-X.h
index c2b74b7..4bc4c3e 100644
--- a/src/m17n-X.h
+++ b/src/m17n-X.h
@@ -27,11 +27,27 @@
 #include <X11/Xutil.h>
 #include <X11/Xresource.h>
 
+#ifndef _M17N_GUI_H_
+#include <m17n-gui.h>
+#endif
+
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
+extern int m17n_init_X (void);
+#undef M17N_INIT_X
+#define M17N_INIT_X() m17n_init_X ()
+
+#undef M17N_INIT
+#define M17N_INIT()			\
+  do {					\
+    if (m17n_init_win () < 0) break;	\
+    if (M17N_INIT_GD () < 0) break;	\
+    M17N_INIT_X ();			\
+  } while (0)
+
 /* For inputting.  */
 
 extern MInputDriver minput_xim_driver;
@@ -83,7 +99,8 @@ typedef struct
   /***ja XSetLocaleModifiers () ¤Î°ú¿ô  */
   char *modifier_list;
 } MInputXIMArgIM;
-  /*=*/
+
+/*=*/
 
 /*** @ingroup m17nInputMethodWin */
 /***en
-- 
1.7.10.4