[BACK]Return to toolkit.h CVS log [TXT] [DIR] Up to [RetroPC.NET] / np2 / x11

Diff for /np2/x11/toolkit.h between versions 1.4 and 1.8

version 1.4, 2003/12/19 16:08:01 version 1.8, 2004/07/26 15:54:18
Line 28 Line 28
 #ifndef NP2_X11_TOOLKIT_H__  #ifndef NP2_X11_TOOLKIT_H__
 #define NP2_X11_TOOLKIT_H__  #define NP2_X11_TOOLKIT_H__
   
 #if !defined(USE_GTK) && !defined(USE_QT) && !defined(USE_SDL)  
 #error undefined USE_GTK and USE_QT and USE_SDL!!!  
 #endif  
   
 typedef struct {  typedef struct {
         const char*     (*get_toolkit)(void);          const char*     (*get_toolkit)(void);
         BOOL            (*arginit)(int* argc, char*** argv);          BOOL            (*arginit)(int* argc, char*** argv);
Line 42  typedef struct { Line 38  typedef struct {
         void            (*widget_quit)(void);          void            (*widget_quit)(void);
         void            (*event_process)(void);          void            (*event_process)(void);
         void            (*set_window_title)(const char* str);          void            (*set_window_title)(const char* str);
           void            (*messagebox)(const char *title, const char *msg);
 } gui_toolkit_t;  } gui_toolkit_t;
   
 #if defined(USE_GTK) && !defined(USE_QT) && !defined(USE_SDL)  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"
   #elif USE_GTK > 0
 #include "gtk/gtk_toolkit.h"  #include "gtk/gtk_toolkit.h"
   #endif
   
 #define toolkit_initialize()  #define toolkit_initialize()
 #define toolkit_terminate()  #define toolkit_terminate()
Line 55  typedef struct { Line 73  typedef struct {
 #define toolkit_widget_show()           gui_gtk_widget_show()  #define toolkit_widget_show()           gui_gtk_widget_show()
 #define toolkit_widget_mainloop()       gui_gtk_widget_mainloop()  #define toolkit_widget_mainloop()       gui_gtk_widget_mainloop()
 #define toolkit_widget_quit()           gui_gtk_widget_quit()  #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_set_window_title(s)     gui_gtk_set_window_title(s)
   #define toolkit_messagebox(t,m)         gui_gtk_messagebox(t,m)
   
 #elif defined(USE_QT) && !defined(USE_GTK) && !defined(USE_SDL)  #elif USE_QT > 0
   
 #include "qt/qttoolkit.h"  #include "qt/qttoolkit.h"
   
Line 69  typedef struct { Line 88  typedef struct {
 #define toolkit_widget_show()           gui_qt_widget_show()  #define toolkit_widget_show()           gui_qt_widget_show()
 #define toolkit_widget_mainloop()       gui_qt_widget_mainloop()  #define toolkit_widget_mainloop()       gui_qt_widget_mainloop()
 #define toolkit_widget_quit()           gui_qt_widget_quit()  #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_set_window_title(s)     gui_qt_set_window_title(s)
   #define toolkit_messagebox(t,m)         gui_qt_messagebox(t,m)
   
 #elif defined(USE_SDL) && !defined(USE_GTK) && !defined(USE_QT)  #elif USE_SDL > 0
   
 #include "sdl/sdl_toolkit.h"  #include "sdl/sdl_toolkit.h"
   
Line 85  typedef struct { Line 105  typedef struct {
 #define toolkit_widget_quit()           gui_sdl_widget_quit()  #define toolkit_widget_quit()           gui_sdl_widget_quit()
 #define toolkit_event_process()         gui_sdl_event_process()  #define toolkit_event_process()         gui_sdl_event_process()
 #define toolkit_set_window_title(s)     gui_sdl_set_window_title(s)  #define toolkit_set_window_title(s)     gui_sdl_set_window_title(s)
   #define toolkit_messagebox(t,m)         gui_sdl_messagebox(t,m)
   
 #else  #elif USE_X11 > 0
   
 extern gui_toolkit_t* toolkitp;  #include "x11/x11_toolkit.h"
   
 void toolkit_initialize(void);  #define toolkit_initialize()
 #define toolkit_terminate()             (*toolkitp->terminate)()  #define toolkit_terminate()
 #define toolkit_arginit(argcp, argvp)   (*toolkitp->arginit)(argcp, argvp)  #define toolkit_arginit(argcp, argvp)   gui_x11_arginit(argcp, argvp)
 #define toolkit_widget_create()         (*toolkitp->widget_create)()  #define toolkit_widget_create()         gui_x11_widget_create()
 #define toolkit_widget_show()           (*toolkitp->widget_show)()  #define toolkit_widget_show()           gui_x11_widget_show()
 #define toolkit_widget_mainloop()       (*toolkitp->widget_mainloop)()  #define toolkit_widget_mainloop()       gui_x11_widget_mainloop()
 #define toolkit_widget_quit()           (*toolkitp->widget_quit)()  #define toolkit_widget_quit()           gui_x11_widget_quit()
 #define toolkit_event_process()         (*toolkitp->event_process)()  #define toolkit_event_process()         gui_x11_event_process()
 #define toolkit_set_window_title(s)     (*toolkitp->set_window_title)(s)  #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
   
Removed from v.1.4  
changed lines
  Added in v.1.8

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