Toolbar/tooltip udates

[wxWidgets.git] / include / wx / spinctrl.h

diff --git a/include/wx/spinctrl.h b/include/wx/spinctrl.h
index 9d6cd5c3e50b8d485b500396b752b9c774c2c77a..453175ebbb8f16219ad68c74de48c8cb3a9d3588 100644 (file)
--- a/include/wx/spinctrl.h
+++ b/include/wx/spinctrl.h
@@ -50,18 +50,24 @@ protected:
 // include the platform-dependent class implementation
 // ----------------------------------------------------------------------------
 
 // include the platform-dependent class implementation
 // ----------------------------------------------------------------------------
 

-#if defined(__WXMSW__) && defined(__WIN32__)
+#if defined(__WXUNIVERSAL__)
+    #include "wx/generic/spinctlg.h"
+#elif defined(__WXMSW__) && defined(__WIN32__)

     #include "wx/msw/spinctrl.h"
 #elif defined(__WXPM__)
     #include "wx/os2/spinctrl.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/spinctrl.h"
     #include "wx/msw/spinctrl.h"
 #elif defined(__WXPM__)
     #include "wx/os2/spinctrl.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/spinctrl.h"

+#elif defined(__WXMOTIF__)
+    #include "wx/generic/spinctlg.h"
+#elif defined(__WXMAC__)
+    #include "wx/generic/spinctlg.h"

 #else // Win16 || !Win
     #include "wx/generic/spinctlg.h"
 #endif // platform
 
 #else // Win16 || !Win
     #include "wx/generic/spinctlg.h"
 #endif // platform
 

-// Macro must be defined here, not event.h, since it must reference wxSpinEventFunction
-#define EVT_SPINCTRL(id, fn) { wxEVT_COMMAND_SPINCTRL_UPDATED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & fn, (wxObject *) NULL },
+#define EVT_SPINCTRL(id, fn) \
+    DECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_SPINCTRL_UPDATED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & fn, (wxObject *) NULL ),

 
 #endif // _WX_SPINCTRL_H_
 
 
 #endif // _WX_SPINCTRL_H_