--- np2/x11/gtk2/gtk_toolkit.h	2005/03/12 12:36:57	1.2
+++ np2/x11/gtk2/gtk_toolkit.h	2011/01/15 19:16:59	1.6
@@ -1,5 +1,3 @@
-/*	$Id: gtk_toolkit.h,v 1.2 2005/03/12 12:36:57 monaka Exp $	*/
-
 /*
  * Copyright (c) 2003 NONAKA Kimihiro
  * All rights reserved.
@@ -28,11 +26,7 @@
 #ifndef	NP2_GTK2_GTKTOOLKIT_H__
 #define	NP2_GTK2_GTKTOOLKIT_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern gui_toolkit_t gtk_toolkit;
+G_BEGIN_DECLS
 
 const char *gui_gtk_get_toolkit(void);
 BOOL gui_gtk_arginit(int *argcp, char ***argvp);
@@ -42,10 +36,8 @@ void gui_gtk_widget_mainloop(void);
 void gui_gtk_widget_quit(void);
 void gui_gtk_event_process(void);
 void gui_gtk_set_window_title(const char* str);
-void gui_gtk_messagebox(const char* title, const char *msg);
+int gui_gtk_msgbox(const char* title, const char *msg, UINT flags);
 
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
 
 #endif	/* NP2_GTK2_GTKTOOLKIT_H__ */