add possibility to specify the conversion to use in wxStringOutputStream; use it...

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

diff --git a/include/wx/spinbutt.h b/include/wx/spinbutt.h
index d2f817ad7792bc712dc6cf1bf7d5292972c4b6a8..820e8c33b4ed90bff404c9e039f751f16430f6c3 100644 (file)
--- a/include/wx/spinbutt.h
+++ b/include/wx/spinbutt.h
@@ -36,7 +36,7 @@
 //  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:
     // ctor initializes the range with the default (0..100) values
 {
 public:
     // ctor initializes the range with the default (0..100) values


@@ -78,8 +78,10 @@ protected:
     #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__)
     #include "wx/mac/spinbutt.h"
 #elif defined(__WXCOCOA__)
 #elif defined(__WXMAC__)
     #include "wx/mac/spinbutt.h"
 #elif defined(__WXCOCOA__)


@@ -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,12 +102,19 @@ 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&);