--- np2/x11/Attic/toolkit.c 2004/01/23 14:35:45 1.2 +++ np2/x11/Attic/toolkit.c 2007/01/10 15:55:27 1.6 @@ -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 @@ -33,16 +31,19 @@ #include "sysmng.h" -#if (USE_GTK + USE_QT + USE_SDL) > 1 +#if (USE_GTK + USE_GTK2 + USE_SDL) > 1 gui_toolkit_t* toolkitp; static struct { gui_toolkit_t* toolkit; } toolkit[] = { +#if USE_GTK > 0 || USE_GTK2 > 0 { >k_toolkit, }, - { &qt_toolkit, }, +#endif +#if USE_SDL > 0 { &sdl_toolkit, }, +#endif }; void @@ -66,7 +67,7 @@ toolkit_initialize(void) toolkitp = >k_toolkit; } -#endif /* USE_GTK + USE_QT + USE_SDL > 1 */ +#endif /* USE_GTK + USE_SDL > 1 */ void toolkit_msgbox(const char *title, const char *msg)