Compilation fix after r62754.

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

diff --git a/include/wx/spinbutt.h b/include/wx/spinbutt.h
index 722ba593acea5e3569d49eb65183e5937488b38d..eb79205a2660d252c817df9eb6794d37404f0f28 100644 (file)
--- a/include/wx/spinbutt.h
+++ b/include/wx/spinbutt.h
@@ -23,7 +23,7 @@
 #include "wx/control.h"
 #include "wx/event.h"
 
 #include "wx/control.h"
 #include "wx/event.h"
 

-#define wxSPIN_BUTTON_NAME _T("wxSpinButton")
+#define wxSPIN_BUTTON_NAME wxT("wxSpinButton")

 
 // ----------------------------------------------------------------------------
 //  The wxSpinButton is like a small scrollbar than is often placed next
 
 // ----------------------------------------------------------------------------
 //  The wxSpinButton is like a small scrollbar than is often placed next


@@ -36,10 +36,10 @@
 //  wxSP_WRAP:         value wraps at either end
 // ----------------------------------------------------------------------------
 
 //  wxSP_WRAP:         value wraps at either end
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxSpinButtonBase : public wxControl
+class WXDLLIMPEXP_CORE wxSpinButtonBase : public wxControl

 {
 public:
 {
 public:

-    // ctor intiializes the range with the default (0..100) values
+    // ctor initializes the range with the default (0..100) values

     wxSpinButtonBase() { m_min = 0; m_max = 100; }
 
     // accessors
     wxSpinButtonBase() { m_min = 0; m_max = 100; }
 
     // accessors


@@ -65,7 +65,7 @@ protected:
     int   m_min;
     int   m_max;
 
     int   m_min;
     int   m_max;
 

-    DECLARE_NO_COPY_CLASS(wxSpinButtonBase)
+    wxDECLARE_NO_COPY_CLASS(wxSpinButtonBase);

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -74,14 +74,16 @@ protected:
 
 #if defined(__WXUNIVERSAL__)
     #include "wx/univ/spinbutt.h"
 
 #if defined(__WXUNIVERSAL__)
     #include "wx/univ/spinbutt.h"

-#elif defined(__WXMSW__) && defined(__WIN95__)
+#elif defined(__WXMSW__)

     #include "wx/msw/spinbutt.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/spinbutt.h"
     #include "wx/msw/spinbutt.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/spinbutt.h"

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

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

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

 #elif defined(__WXMAC__)
 #elif defined(__WXMAC__)

-    #include "wx/mac/spinbutt.h"
+    #include "wx/osx/spinbutt.h"

 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/spinbutt.h"
 #elif defined(__WXPM__)
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/spinbutt.h"
 #elif defined(__WXPM__)


@@ -92,7 +94,7 @@ protected:
 // the wxSpinButton event
 // ----------------------------------------------------------------------------
 
 // the wxSpinButton event
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxSpinEvent : public wxNotifyEvent
+class WXDLLIMPEXP_CORE wxSpinEvent : public wxNotifyEvent

 {
 public:
     wxSpinEvent(wxEventType commandType = wxEVT_NULL, int winid = 0)
 {
 public:
     wxSpinEvent(wxEventType commandType = wxEVT_NULL, int winid = 0)


@@ -100,23 +102,37 @@ public:
     {
     }
 
     {
     }
 

+    wxSpinEvent(const wxSpinEvent& event) : wxNotifyEvent(event) {}
+

     // get the current value of the control
     // get the current value of the control

+    int GetValue() const { return m_commandInt; }
+    void SetValue(int value) { m_commandInt = value; }
+

     int GetPosition() const { return m_commandInt; }
     void SetPosition(int pos) { m_commandInt = pos; }
 
     int GetPosition() const { return m_commandInt; }
     void SetPosition(int pos) { m_commandInt = pos; }
 

+    virtual wxEvent *Clone() const { return new wxSpinEvent(*this); }
+

 private:
 private:

-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxSpinEvent)
+    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSpinEvent)

 };
 
 typedef void (wxEvtHandler::*wxSpinEventFunction)(wxSpinEvent&);
 
 };
 
 typedef void (wxEvtHandler::*wxSpinEventFunction)(wxSpinEvent&);
 

-// macros for handling spin events
+#define wxSpinEventHandler(func) \
+    wxEVENT_HANDLER_CAST(wxSpinEventFunction, func)
+
+// macros for handling spin events: notice that we must use the real values of
+// the event type constants and not their references (wxEVT_SPIN[_UP/DOWN])
+// here as otherwise the event tables could end up with non-initialized
+// (because of undefined initialization order of the globals defined in
+// different translation units) references in them

 #define EVT_SPIN_UP(winid, func) \
 #define EVT_SPIN_UP(winid, func) \

-    DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_LINEUP, winid, -1, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxSpinEventFunction, & func ), NULL ),
+    wx__DECLARE_EVT1(wxEVT_SPIN_UP, winid, wxSpinEventHandler(func))

 #define EVT_SPIN_DOWN(winid, func) \
 #define EVT_SPIN_DOWN(winid, func) \

-    DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_LINEDOWN, winid, -1, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxSpinEventFunction, & func ), NULL ),
+    wx__DECLARE_EVT1(wxEVT_SPIN_DOWN, winid, wxSpinEventHandler(func))

 #define EVT_SPIN(winid, func) \
 #define EVT_SPIN(winid, func) \

-    DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_THUMBTRACK, winid, -1, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxSpinEventFunction, & func ), NULL ),
+    wx__DECLARE_EVT1(wxEVT_SPIN, winid, wxSpinEventHandler(func))

 
 #endif // wxUSE_SPINBTN
 
 
 #endif // wxUSE_SPINBTN