--- np2/x11/fontmng.h	2003/12/19 16:08:01	1.3
+++ np2/x11/fontmng.h	2011/01/15 19:16:58	1.5
@@ -1,6 +1,8 @@
 #ifndef	NP2_X11_FONTMNG_H__
 #define	NP2_X11_FONTMNG_H__
 
+G_BEGIN_DECLS
+
 enum {
 	FDAT_BOLD		= 0x01,
 	FDAT_PROPORTIONAL	= 0x02,
@@ -19,21 +21,16 @@ typedef struct {
 	int	pitch;
 } _FNTDAT, *FNTDAT;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 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);
-void fontmng_terminate(void);
 
 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);
 
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
 
 #endif	/* NP2_X11_FONTMNG_H__ */