From: handa <handa>
Date: Fri, 13 Aug 2004 12:04:20 +0000 (+0000)
Subject: (Mx, Mfreetype): Delete it.
X-Git-Tag: REL-1-1-0~15
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6d16bf354943c121ce7a88a957be13f5e1dda06;p=m17n%2Fm17n-lib.git

(Mx, Mfreetype): Delete it.
(m17n_init_win): Don't initialize Mx and Mfreetype here.
---

diff --git a/src/m17n-gui.c b/src/m17n-gui.c
index cac713a..917462b 100644
--- a/src/m17n-gui.c
+++ b/src/m17n-gui.c
@@ -232,8 +232,6 @@ static MDeviceLibraryInterface null_interface =
 
 /* Internal API */
 
-MSymbol Mfreetype;
-
 /*** @} */ 
 #endif /* !FOR_DOXYGEN || DOXYGEN_INTERNAL_MODULE */
 
@@ -253,10 +251,8 @@ m17n_init_win (void)
 
   MDEBUG_PUSH_TIME ();
 
-  Mx = msymbol ("x");
   Mgd = msymbol ("gd");
 
-  Mfreetype = msymbol ("freetype");
   Mfont = msymbol ("font");
   Mfont_width = msymbol ("font-width");
   Mfont_ascent = msymbol ("font-ascent");
@@ -269,9 +265,6 @@ m17n_init_win (void)
   Mdepth = msymbol ("depth");
   Mwidget = msymbol ("widget");
 
-  register_device_library (Mx, "libm17n-X");
-  register_device_library (Mgd, "libm17n-gd");
-
   MDEBUG_PUSH_TIME ();
   if (mfont__init () < 0)
     goto err;
@@ -289,6 +282,9 @@ m17n_init_win (void)
     goto err;
   MDEBUG_PRINT_TIME ("INIT", (stderr, " to initialize input-win module."));
   mframe_default = NULL;
+
+  register_device_library (Mx, "libm17n-X");
+  register_device_library (Mgd, "libm17n-gd");
   return 0;
 
  err:
@@ -387,7 +383,7 @@ m17n_fini_win (void)
 
 MSymbol Mdevice, Mdisplay, Mscreen, Mdrawable, Mdepth, Mcolormap, Mwidget; 
 
-MSymbol Mx, Mgd;
+MSymbol Mgd;
 
 /*=*/