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

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

version 1.2, 2003/11/26 14:55:01 version 1.4, 2003/12/19 16:08:01
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)  #if !defined(USE_GTK) && !defined(USE_QT) && !defined(USE_SDL)
 #error undefined both USE_GTK and USE_QT!!!  #error undefined USE_GTK and USE_QT and USE_SDL!!!
 #endif  #endif
   
 typedef struct {  typedef struct {
Line 40  typedef struct { Line 40  typedef struct {
         void            (*widget_show)(void);          void            (*widget_show)(void);
         void            (*widget_mainloop)(void);          void            (*widget_mainloop)(void);
         void            (*widget_quit)(void);          void            (*widget_quit)(void);
           void            (*event_process)(void);
         void            (*set_window_title)(const char* str);          void            (*set_window_title)(const char* str);
 } gui_toolkit_t;  } gui_toolkit_t;
   
 #if defined(USE_GTK) && defined(USE_QT)  #if defined(USE_GTK) && !defined(USE_QT) && !defined(USE_SDL)
   
 extern gui_toolkit_t* toolkitp;  #include "gtk/gtk_toolkit.h"
   
 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_set_window_title(s)     (*toolkitp->set_window_title)(s)  
   
 #elif defined(USE_GTK)  
   
 #include "gtk/gtktoolkit.h"  
   
 #define toolkit_initialize()  #define toolkit_initialize()
 #define toolkit_terminate()  #define toolkit_terminate()
Line 67  void toolkit_initialize(void); Line 55  void toolkit_initialize(void);
 #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_set_window_title(s)     gui_gtk_set_window_title(s)  #define toolkit_set_window_title(s)     gui_gtk_set_window_title(s)
   
 #elif defined(USE_QT)  #elif defined(USE_QT) && !defined(USE_GTK) && !defined(USE_SDL)
   
 #include "qt/qttoolkit.h"  #include "qt/qttoolkit.h"
   
Line 80  void toolkit_initialize(void); Line 69  void toolkit_initialize(void);
 #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_set_window_title(s)     gui_qt_set_window_title(s)  #define toolkit_set_window_title(s)     gui_qt_set_window_title(s)
   
   #elif defined(USE_SDL) && !defined(USE_GTK) && !defined(USE_QT)
   
   #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)
   
   #else
   
   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)
   
 #endif  #endif
   
 #endif  /* NP2_X11_TOOLKIT_H__ */  #endif  /* NP2_X11_TOOLKIT_H__ */
Removed from v.1.2  
changed lines
  Added in v.1.4

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