--- np2/x11/toolkit.h	2003/11/16 16:43:45	1.1
+++ np2/x11/toolkit.h	2004/07/14 16:01:40	1.7
@@ -28,53 +28,101 @@
 #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
-
 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		(*event_process)(void);
 	void		(*set_window_title)(const char* str);
+	void		(*messagebox)(const char *title, const char *msg);
 } gui_toolkit_t;
 
-#if defined(USE_GTK) && defined(USE_QT)
+#if (USE_GTK + USE_GTK2 + USE_QT + USE_SDL + USE_X11) > 1
 
 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()		(*widget_create)()
-#define	toolkit_widget_show()		(*widget_show)()
-#define	toolkit_widget_mainloop()	(*widget_mainloop)()
-#define	toolkit_widget_quit()		(*widget_quit)()
+#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_event_process()		(*toolkitp->event_process)()
 #define	toolkit_set_window_title(s)	(*toolkitp->set_window_title)(s)
+#define	toolkit_messagebox(t,m)		(*toolkitp->messagebox)(t,m)
 
-#elif defined(USE_GTK)
+#elif USE_GTK > 0 || USE_GTK2 > 0
 
-#include "gtk/gtktoolkit.h"
+#if USE_GTK2 > 0
+#include "gtk2/gtk_toolkit.h"
+#elif USE_GTK > 0
+#include "gtk/gtk_toolkit.h"
+#endif
 
 #define	toolkit_initialize()
+#define	toolkit_terminate()
 #define	toolkit_arginit(argcp, argvp)	gui_gtk_arginit(argcp, argvp)
 #define	toolkit_widget_create()		gui_gtk_widget_create()
 #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)
+#define	toolkit_messagebox(t,m)		gui_gtk_messagebox(t,m)
+
+#elif USE_QT > 0
+
+#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_event_process()		gui_qt_event_process()
+#define	toolkit_set_window_title(s)	gui_qt_set_window_title(s)
+#define	toolkit_messagebox(t,m)		gui_qt_messagebox(t,m)
 
-#elif defined(USE_QT)
+#elif USE_SDL > 0
+
+#include "sdl/sdl_toolkit.h"
 
 #define	toolkit_initialize()
-#define	toolkit_arginit(argcp, argvp)
-#define	toolkit_widget_create()	
-#define	toolkit_widget_show()	
-#define	toolkit_widget_mainloop()
-#define	toolkit_widget_quit()
-#define	toolkit_set_window_title(s)
+#define	toolkit_terminate()
+#define	toolkit_arginit(argcp, argvp)	gui_sdl_arginit(argcp, argvp)
+#define	toolkit_widget_create()		gui_sdl_widget_create()
+#define	toolkit_widget_show()		gui_sdl_widget_show()
+#define	toolkit_widget_mainloop()	gui_sdl_widget_mainloop()
+#define	toolkit_widget_quit()		gui_sdl_widget_quit()
+#define	toolkit_event_process()		gui_sdl_event_process()
+#define	toolkit_set_window_title(s)	gui_sdl_set_window_title(s)
+#define	toolkit_messagebox(t,m)		gui_sdl_messagebox(t,m)
+
+#elif USE_X11 > 0
+
+#include "x11/x11_toolkit.h"
+
+#define	toolkit_initialize()
+#define	toolkit_terminate()
+#define	toolkit_arginit(argcp, argvp)	gui_x11_arginit(argcp, argvp)
+#define	toolkit_widget_create()		gui_x11_widget_create()
+#define	toolkit_widget_show()		gui_x11_widget_show()
+#define	toolkit_widget_mainloop()	gui_x11_widget_mainloop()
+#define	toolkit_widget_quit()		gui_x11_widget_quit()
+#define	toolkit_event_process()		gui_x11_event_process()
+#define	toolkit_set_window_title(s)	gui_x11_set_window_title(s)
+#define	toolkit_messagebox(t,m)		gui_x11_messagebox(t,m)
+
+#else
+
+#error undefined USE_GTK and USE_QT and USE_SDL and USE_X11!!!
 
 #endif