fix the tests to pass with both gcc and msvc (2nd part of patch 1462778)

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

diff --git a/include/wx/spinctrl.h b/include/wx/spinctrl.h
index 71e7f418a9fe23bd47002594239962dfaf0d3e6a..6080b61365c86eea4eb919457d5b05b14da0829f 100644 (file)
--- a/include/wx/spinctrl.h
+++ b/include/wx/spinctrl.h
@@ -6,12 +6,16 @@
 // Created:     22.07.99
 // RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin
 // Created:     22.07.99
 // RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SPINCTRL_H_
 #define _WX_SPINCTRL_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SPINCTRL_H_
 #define _WX_SPINCTRL_H_
 

+#include "wx/defs.h"
+
+#if wxUSE_SPINCTRL
+

 #include "wx/spinbutt.h"        // should make wxSpinEvent visible to the app
 
 // ----------------------------------------------------------------------------
 #include "wx/spinbutt.h"        // should make wxSpinEvent visible to the app
 
 // ----------------------------------------------------------------------------


@@ -59,8 +63,10 @@ protected:
     #include "wx/msw/spinctrl.h"
 #elif defined(__WXPM__)
     #include "wx/os2/spinctrl.h"
     #include "wx/msw/spinctrl.h"
 #elif defined(__WXPM__)
     #include "wx/os2/spinctrl.h"

-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)

     #include "wx/gtk/spinctrl.h"
     #include "wx/gtk/spinctrl.h"

+#elif defined(__WXGTK__)
+    #include "wx/gtk1/spinctrl.h"

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


@@ -70,7 +76,8 @@ protected:
 #endif // platform
 
 #define EVT_SPINCTRL(id, fn) \
 #endif // platform
 
 #define EVT_SPINCTRL(id, fn) \

-    DECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_SPINCTRL_UPDATED, id, -1, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxSpinEventFunction, & fn ), (wxObject *) NULL ),
+    wx__DECLARE_EVT1(wxEVT_COMMAND_SPINCTRL_UPDATED, id, wxSpinEventHandler(fn))

 
 

-#endif // _WX_SPINCTRL_H_
+#endif // wxUSE_SPINCTRL

 
 

+#endif // _WX_SPINCTRL_H_