fix ifdef - its libpng not pnglib :)

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

diff --git a/include/wx/spinctrl.h b/include/wx/spinctrl.h
index 94b62fb8463188700c8cdb9df8277862e9a38bc8..0d7f175cbb4de1cae656aa75ae1b39a25d5a4e33 100644 (file)
--- a/include/wx/spinctrl.h
+++ b/include/wx/spinctrl.h
@@ -37,6 +37,9 @@ public:
     virtual void SetValue(int val) = 0;
     virtual void SetRange(int minVal, int maxVal) = 0;
 
     virtual void SetValue(int val) = 0;
     virtual void SetRange(int minVal, int maxVal) = 0;
 

+    // as the wxTextCtrl method
+    virtual void SetSelection(long from, long to) = 0;
+

 protected:
     // initialize m_min/max with the default values
     void Init() { m_min = 0; m_max = 100; }
 protected:
     // initialize m_min/max with the default values
     void Init() { m_min = 0; m_max = 100; }


@@ -50,19 +53,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__)

     #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"

-#else // Win16 || !Win
+#elif defined(__WXMOTIF__)
+    #include "wx/generic/spinctlg.h"
+#elif defined(__WXMAC__)
+    #include "wx/mac/spinctrl.h"
+#elif defined(__WXCOCOA__)

     #include "wx/generic/spinctlg.h"
 #endif // platform
 
     #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) \
 #define EVT_SPINCTRL(id, fn) \

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

 
 #endif // _WX_SPINCTRL_H_
 
 
 #endif // _WX_SPINCTRL_H_