--- np2/x11/toolkit.h	2004/01/23 14:35:45	1.5
+++ np2/x11/toolkit.h	2005/03/12 12:36:13	1.9
@@ -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
@@ -41,7 +39,9 @@ typedef struct {
 	void		(*messagebox)(const char *title, const char *msg);
 } gui_toolkit_t;
 
-#if (USE_GTK + USE_QT + USE_SDL) > 1
+void toolkit_msgbox(const char *title, const char *msg);
+
+#if (USE_GTK + USE_GTK2 + USE_QT + USE_SDL + USE_X11) > 1
 
 extern gui_toolkit_t* toolkitp;
 
@@ -56,9 +56,13 @@ void toolkit_initialize(void);
 #define	toolkit_set_window_title(s)	(*toolkitp->set_window_title)(s)
 #define	toolkit_messagebox(t,m)		(*toolkitp->messagebox)(t,m)
 
-#elif USE_GTK > 0
+#elif USE_GTK > 0 || USE_GTK2 > 0
 
+#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()
@@ -67,7 +71,7 @@ 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()
+#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)
 
@@ -82,7 +86,7 @@ void toolkit_initialize(void);
 #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()
+#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)
 
@@ -101,9 +105,24 @@ void toolkit_initialize(void);
 #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!!!
+#error undefined USE_GTK and USE_QT and USE_SDL and USE_X11!!!
 
 #endif