Diff for /np2/x11/toolkit.h between versions 1.9 and 1.13

version 1.9, 2005/03/12 12:36:13 version 1.13, 2011/01/15 18:43:13
Line 26 Line 26
 #ifndef NP2_X11_TOOLKIT_H__  #ifndef NP2_X11_TOOLKIT_H__
 #define NP2_X11_TOOLKIT_H__  #define NP2_X11_TOOLKIT_H__
   
 typedef struct {  /* for toolkit_msgbox() */
         const char*     (*get_toolkit)(void);  #define TK_MB_OK                (1U <<  0)
         BOOL            (*arginit)(int* argc, char*** argv);  #define TK_MB_CANCEL            (1U <<  1)
         void            (*terminate)(void);  #define TK_MB_YES               (1U <<  2)
         void            (*widget_create)(void);  #define TK_MB_NO                (1U <<  3)
         void            (*widget_show)(void);  #define TK_MB_OKCANCEL          (TK_MB_OK|TK_MB_CANCEL)
         void            (*widget_mainloop)(void);  #define TK_MB_YESNO             (TK_MB_YES|TK_MB_NO)
         void            (*widget_quit)(void);  #define TK_MB_BTN_MASK          (TK_MB_OK|TK_MB_CANCEL|TK_MB_YESNO)
         void            (*event_process)(void);  #define TK_MB_ICON_INFO         (1U << 16)
         void            (*set_window_title)(const char* str);  #define TK_MB_ICON_WARNING      (1U << 17)
         void            (*messagebox)(const char *title, const char *msg);  #define TK_MB_ICON_ERROR        (1U << 18)
 } gui_toolkit_t;  #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)
   
 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;  
   
 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_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 USE_GTK > 0 || USE_GTK2 > 0  
   
 #if USE_GTK2 > 0  
 #include "gtk2/gtk_toolkit.h"  #include "gtk2/gtk_toolkit.h"
 #elif USE_GTK > 0  
 #include "gtk/gtk_toolkit.h"  
 #endif  
   
 #define toolkit_initialize()  #define toolkit_initialize()
 #define toolkit_terminate()  #define toolkit_terminate()
Line 73  void toolkit_initialize(void); Line 54  void toolkit_initialize(void);
 #define toolkit_widget_quit()           gui_gtk_widget_quit()  #define toolkit_widget_quit()           gui_gtk_widget_quit()
 #define toolkit_event_process()         gui_gtk_event_process()  #define toolkit_event_process()         gui_gtk_event_process()
 #define toolkit_set_window_title(s)     gui_gtk_set_window_title(s)  #define toolkit_set_window_title(s)     gui_gtk_set_window_title(s)
 #define toolkit_messagebox(t,m)         gui_gtk_messagebox(t,m)  #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)
 #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 USE_SDL > 0  
   
 #include "sdl/sdl_toolkit.h"  
   
 #define toolkit_initialize()  
 #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  
   
 #endif  /* NP2_X11_TOOLKIT_H__ */  #endif  /* NP2_X11_TOOLKIT_H__ */

Removed from v.1.9  
changed lines
  Added in v.1.13


RetroPC.NET-CVS <cvs@retropc.net>