--- np2/x11/fontmng.h	2003/10/16 17:59:41	1.1.1.1
+++ np2/x11/fontmng.h	2011/01/15 19:16:58	1.5
@@ -1,13 +1,17 @@
+#ifndef	NP2_X11_FONTMNG_H__
+#define	NP2_X11_FONTMNG_H__
+
+G_BEGIN_DECLS
 
 enum {
-	FDAT_BOLD			= 0x01,
+	FDAT_BOLD		= 0x01,
 	FDAT_PROPORTIONAL	= 0x02,
-	FDAT_ALIAS			= 0x04,
-	FDAT_ANSI			= 0x08
+	FDAT_ALIAS		= 0x04,
+	FDAT_ANSI		= 0x08
 };
 
 enum {
-	FDAT_DEPTH			= 255,
+	FDAT_DEPTH		= 255,
 	FDAT_DEPTHBIT		= 8
 };
 
@@ -17,25 +21,16 @@ typedef struct {
 	int	pitch;
 } _FNTDAT, *FNTDAT;
 
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void *fontmng_create(int size, UINT type, const char *fontface);
+BOOL fontmng_init(void);
+void fontmng_terminate(void);
+void fontmng_setdeffontname(const TCHAR *fontface);
+void* fontmng_create(int size, UINT type, const TCHAR *fontface);
 void fontmng_destroy(void *hdl);
 
 BOOL fontmng_getsize(void *hdl, const char *string, POINT_T *pt);
 BOOL fontmng_getdrawsize(void *hdl, const char *string, POINT_T *pt);
 FNTDAT fontmng_get(void *hdl, const char *string);
 
+G_END_DECLS
 
-// ---- for SDL
-
-BOOL fontmng_init(void);
-void fontmng_setdeffontname(const char *name);
-
-#ifdef __cplusplus
-}
-#endif
-
+#endif	/* NP2_X11_FONTMNG_H__ */