*** empty log message ***

[m17n/m17n-lib.git] / src / m17n-gui.c

diff --git a/src/m17n-gui.c b/src/m17n-gui.c
index 2c3c011..1a40ed1 100644 (file)
--- a/src/m17n-gui.c
+++ b/src/m17n-gui.c
@@ -36,7 +36,7 @@
     implement XOM, not for direct use from application programs.
 */
 
-/***ja
+/***oldja
     @addtogroup m17nGUI
     @brief ¥¦¥£¥ó¥É¥¦¥·¥¹¥Æ¥à´ØÏ¢¤Î¿¸À¸ìÂбþ 
 
@@ -76,6 +76,7 @@ free_frame (void *object)
 
   M17N_OBJECT_UNREF (frame->face);
   mwin__close_device ((MFrame *) object);
+  free (frame->font);
   free (object);
 }
 
@@ -96,7 +97,7 @@ m17n_init_win (void)
   if (win_initialized)
     return;
   m17n_init ();
-  if (merror_code < 0)
+  if (merror_code != MERROR_NONE)
     return;
 
   Mfont = msymbol ("font");
@@ -143,21 +144,21 @@ m17n_fini_win (void)
     {
       MDEBUG_PUSH_TIME ();
       MDEBUG_PUSH_TIME ();
-      MDEBUG_PRINT_TIME ("INIT", (stderr, " to finalize input-gui module."));
+      MDEBUG_PRINT_TIME ("FINI", (stderr, " to finalize input-gui module."));
       minput__win_fini ();
-      MDEBUG_PRINT_TIME ("INIT", (stderr, " to finalize draw module."));
+      MDEBUG_PRINT_TIME ("FINI", (stderr, " to finalize draw module."));
       mdraw__fini ();
-      MDEBUG_PRINT_TIME ("INIT", (stderr, " to finalize face module."));
+      MDEBUG_PRINT_TIME ("FINI", (stderr, " to finalize face module."));
       mface__fini ();
-      MDEBUG_PRINT_TIME ("INIT", (stderr, " to finalize fontset module."));
+      MDEBUG_PRINT_TIME ("FINI", (stderr, " to finalize fontset module."));
       mfont__fontset_fini ();
-      MDEBUG_PRINT_TIME ("INIT", (stderr, " to finalize window module."));
+      MDEBUG_PRINT_TIME ("FINI", (stderr, " to finalize window module."));
       mwin__fini ();
-      MDEBUG_PRINT_TIME ("INIT", (stderr, " to finalize font module."));
+      MDEBUG_PRINT_TIME ("FINI", (stderr, " to finalize font module."));
       mfont__fini ();
       mframe_default = NULL;
       MDEBUG_POP_TIME ();
-      MDEBUG_PRINT_TIME ("INIT", (stderr, " to finalize the gui modules."));
+      MDEBUG_PRINT_TIME ("FINI", (stderr, " to finalize the gui modules."));
       MDEBUG_POP_TIME ();
       win_initialized = 0;
     }
@@ -173,7 +174,7 @@ m17n_fini_win (void)
     m17n GUI functions require a pointer to a frame as an
     argument.  */
 
-/***ja
+/***oldja
     @brief ¥Õ¥ì¡¼¥à¤È¤ÏʪÍýŪ¥Ç¥Ð¥¤¥¹¤ËÂбþ¤¹¤ë¥ª¥Ö¥¸¥§¥¯¥È¤Ç¤¢¤ë
 
     ¥Õ¥ì¡¼¥à¤È¤Ï #MFrame ·¿¤Î¥ª¥Ö¥¸¥§¥¯¥È¤Ç¤¢¤ê¡¢¸Ä¡¹¤ÎʪÍýŪ¤Êɽ¼¨¡¿
@@ -272,7 +273,7 @@ MSymbol Mfont_descent;
     If the operation was successful, mframe () returns a pointer to a
     newly created frame.  Otherwise, it returns @c NULL.  */
 
-/***ja
+/***oldja
     @brief  ¿·¤·¤¤¥Õ¥ì¡¼¥à¤òºî¤ë
 
     ´Ø¿ô mframe () ¤Ï¿·¤·¤¤¥Õ¥ì¡¼¥à¤òºî¤ë¡£°ìÈ̤ˡ¢°ú¿ô $ARGC ¤È $ARGV 
@@ -313,7 +314,9 @@ mframe (MPlist *plist)
       MERROR (MERROR_WIN, NULL);
     }
 
-  frame->face = mface_copy (mface__default);
+  frame->face = mface_from_font (frame->font);
+  frame->face->property[MFACE_FONTSET] = mfontset (NULL);
+  M17N_OBJECT_REF (mface__default->property[MFACE_FONTSET]);
   if (plist)
     for (; (key = mplist_key (plist)) != Mnil; plist = mplist_next (plist))
       if (key == Mface)
@@ -374,7 +377,7 @@ mframe (MPlist *plist)
 @endverbatim
 */
 
-/***ja
+/***oldja
     @brief ¥Õ¥ì¡¼¥à¤ÎMWDevice¤òÊÖ¤¹
 
     ´Ø¿ô mframe_device () ¤Ï¥Õ¥ì¡¼¥à $FRAME ¤Ë³ÊǼ¤µ¤ì¤Æ¤¤¤ë @c
@@ -405,7 +408,7 @@ mframe_get_prop (MFrame *frame, MSymbol key)
     The external variable #mframe_default contains a pointer to the
     default frame that is created by the first call of mframe ().  */
 
-/***ja
+/***oldja
     ¥Ç¥Õ¥©¥ë¥È¤Î¥Õ¥ì¡¼¥à 
 
     ³°ÉôÊÑ¿ô #mframe_default ¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Î¥Õ¥ì¡¼¥à¤Ø¤Î¥Ý¥¤¥ó¥¿¤ò