Diff for /np2/x11/toolkit.h between versions 1.6 and 1.7

version 1.6, 2004/02/06 16:51:21 version 1.7, 2004/07/14 16:01:40
Line 41  typedef struct { Line 41  typedef struct {
         void            (*messagebox)(const char *title, const char *msg);          void            (*messagebox)(const char *title, const char *msg);
 } gui_toolkit_t;  } gui_toolkit_t;
   
 #if (USE_GTK + USE_QT + USE_SDL + USE_X11) > 1  #if (USE_GTK + USE_GTK2 + USE_QT + USE_SDL + USE_X11) > 1
   
 extern gui_toolkit_t* toolkitp;  extern gui_toolkit_t* toolkitp;
   
Line 56  void toolkit_initialize(void); Line 56  void toolkit_initialize(void);
 #define toolkit_set_window_title(s)     (*toolkitp->set_window_title)(s)  #define toolkit_set_window_title(s)     (*toolkitp->set_window_title)(s)
 #define toolkit_messagebox(t,m)         (*toolkitp->messagebox)(t,m)  #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"  #include "gtk/gtk_toolkit.h"
   #endif
   
 #define toolkit_initialize()  #define toolkit_initialize()
 #define toolkit_terminate()  #define toolkit_terminate()
Line 67  void toolkit_initialize(void); Line 71  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_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_messagebox(t,m)
   
Line 82  void toolkit_initialize(void); Line 86  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_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)  #define toolkit_messagebox(t,m)         gui_qt_messagebox(t,m)
   

Removed from v.1.6  
changed lines
  Added in v.1.7


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