--- np2/x11/toolkit.h	2003/11/26 14:55:01	1.2
+++ np2/x11/toolkit.h	2011/01/15 18:43:13	1.13
@@ -10,8 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -28,37 +26,24 @@
 #ifndef	NP2_X11_TOOLKIT_H__
 #define	NP2_X11_TOOLKIT_H__
 
-#if !defined(USE_GTK) && !defined(USE_QT)
-#error undefined both USE_GTK and USE_QT!!!
-#endif
+/* for toolkit_msgbox() */
+#define	TK_MB_OK		(1U <<  0)
+#define	TK_MB_CANCEL		(1U <<  1)
+#define	TK_MB_YES		(1U <<  2)
+#define	TK_MB_NO		(1U <<  3)
+#define	TK_MB_OKCANCEL		(TK_MB_OK|TK_MB_CANCEL)
+#define	TK_MB_YESNO		(TK_MB_YES|TK_MB_NO)
+#define	TK_MB_BTN_MASK		(TK_MB_OK|TK_MB_CANCEL|TK_MB_YESNO)
+#define	TK_MB_ICON_INFO		(1U << 16)
+#define	TK_MB_ICON_WARNING	(1U << 17)
+#define	TK_MB_ICON_ERROR	(1U << 18)
+#define	TK_MB_ICON_QUESTION	(1U << 19)
+#define	TK_MB_ICON_MASK		(TK_MB_ICON_INFO \
+				 |TK_MB_ICON_WARNING \
+				 |TK_MB_ICON_ERROR \
+				 |TK_MB_ICON_QUESTION)
 
-typedef struct {
-	const char*	(*get_toolkit)(void);
-	BOOL		(*arginit)(int* argc, char*** argv);
-	void		(*terminate)(void);
-	void		(*widget_create)(void);
-	void		(*widget_show)(void);
-	void		(*widget_mainloop)(void);
-	void		(*widget_quit)(void);
-	void		(*set_window_title)(const char* str);
-} gui_toolkit_t;
-
-#if defined(USE_GTK) && defined(USE_QT)
-
-extern gui_toolkit_t* toolkitp;
-
-void toolkit_initialize(void);
-#define	toolkit_terminate()		(*toolkitp->terminate)()
-#define	toolkit_arginit(argcp, argvp)	(*toolkitp->arginit)(argcp, argvp)
-#define	toolkit_widget_create()		(*toolkitp->widget_create)()
-#define	toolkit_widget_show()		(*toolkitp->widget_show)()
-#define	toolkit_widget_mainloop()	(*toolkitp->widget_mainloop)()
-#define	toolkit_widget_quit()		(*toolkitp->widget_quit)()
-#define	toolkit_set_window_title(s)	(*toolkitp->set_window_title)(s)
-
-#elif defined(USE_GTK)
-
-#include "gtk/gtktoolkit.h"
+#include "gtk2/gtk_toolkit.h"
 
 #define	toolkit_initialize()
 #define	toolkit_terminate()
@@ -67,21 +52,9 @@ void toolkit_initialize(void);
 #define	toolkit_widget_show()		gui_gtk_widget_show()
 #define	toolkit_widget_mainloop()	gui_gtk_widget_mainloop()
 #define	toolkit_widget_quit()		gui_gtk_widget_quit()
+#define	toolkit_event_process()		gui_gtk_event_process()
 #define	toolkit_set_window_title(s)	gui_gtk_set_window_title(s)
-
-#elif defined(USE_QT)
-
-#include "qt/qttoolkit.h"
-
-#define	toolkit_initialize()
-#define	toolkit_terminate()		gui_qt_terminate()
-#define	toolkit_arginit(argcp, argvp)	gui_qt_arginit(argcp, argvp)
-#define	toolkit_widget_create()		gui_qt_widget_create()
-#define	toolkit_widget_show()		gui_qt_widget_show()
-#define	toolkit_widget_mainloop()	gui_qt_widget_mainloop()
-#define	toolkit_widget_quit()		gui_qt_widget_quit()
-#define	toolkit_set_window_title(s)	gui_qt_set_window_title(s)
-
-#endif
+#define	toolkit_messagebox(t,m)		gui_gtk_msgbox(t,m,TK_MB_OK|TK_MB_ICON_INFO)
+#define	toolkit_msgbox(t,m,f)		gui_gtk_msgbox(t,m,f)
 
 #endif	/* NP2_X11_TOOLKIT_H__ */