bracket unused function

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

diff --git a/include/wx/spinbutt.h b/include/wx/spinbutt.h
index 2db0d6880df7ae92352a2cec45232be8cfd8b940..899bacea15bea1e4c7f4fe6cbf4af70a2ac3ad5a 100644 (file)
--- a/include/wx/spinbutt.h
+++ b/include/wx/spinbutt.h
@@ -22,8 +22,9 @@
 
 #include "wx/control.h"
 #include "wx/event.h"
 
 #include "wx/control.h"
 #include "wx/event.h"

+#include "wx/range.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,38 +37,38 @@
 //  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:

-    wxSpinButtonBase() { InitBase(); }
+    // ctor initializes the range with the default (0..100) values
+    wxSpinButtonBase() { m_min = 0; m_max = 100; }

 
     // accessors
     virtual int GetValue() const = 0;
     virtual int GetMin() const { return m_min; }
     virtual int GetMax() const { return m_max; }
 
     // accessors
     virtual int GetValue() const = 0;
     virtual int GetMin() const { return m_min; }
     virtual int GetMax() const { return m_max; }

+    wxRange GetRange() const { return wxRange( GetMin(), GetMax() );}

 
     // operations
     virtual void SetValue(int val) = 0;
 
     // operations
     virtual void SetValue(int val) = 0;

+    virtual void SetMin(int minVal) { SetRange ( minVal , m_max ) ; }
+    virtual void SetMax(int maxVal) { SetRange ( m_min , maxVal ) ; }

     virtual void SetRange(int minVal, int maxVal)
     {
         m_min = minVal;
         m_max = maxVal;
     }
     virtual void SetRange(int minVal, int maxVal)
     {
         m_min = minVal;
         m_max = maxVal;
     }

+    void SetRange( const wxRange& range) { SetRange( range.GetMin(), range.GetMax()); }

 
     // is this spin button vertically oriented?
     bool IsVertical() const { return (m_windowStyle & wxSP_VERTICAL) != 0; }
 
 protected:
 
     // is this spin button vertically oriented?
     bool IsVertical() const { return (m_windowStyle & wxSP_VERTICAL) != 0; }
 
 protected:

-    // init the base part of the control
-    void InitBase()
-    {
-        m_min = 0;
-        m_max = 100;
-    }
-

     // the range value
     int   m_min;
     int   m_max;
     // the range value
     int   m_min;
     int   m_max;

+
+    wxDECLARE_NO_COPY_CLASS(wxSpinButtonBase);

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


@@ -76,14 +77,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__)


@@ -94,31 +97,45 @@ protected:
 // the wxSpinButton event
 // ----------------------------------------------------------------------------
 
 // the wxSpinButton event
 // ----------------------------------------------------------------------------
 

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

 {
 public:
 {
 public:

-    wxSpinEvent(wxEventType commandType = wxEVT_NULL, int id = 0)
-           : wxNotifyEvent(commandType, id)
+    wxSpinEvent(wxEventType commandType = wxEVT_NULL, int winid = 0)
+           : wxNotifyEvent(commandType, winid)

     {
     }
 
     {
     }
 

+    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(wxSpinEvent)
+    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSpinEvent)

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

-// macros for handling spin events
-#define EVT_SPIN_UP(id, func) \
-    DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_LINEUP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func, NULL ),
-#define EVT_SPIN_DOWN(id, func) \
-    DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_LINEDOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func, NULL ),
-#define EVT_SPIN(id, func) \
-    DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_THUMBTRACK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func, NULL ),
+#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) \
+    wx__DECLARE_EVT1(wxEVT_SPIN_UP, winid, wxSpinEventHandler(func))
+#define EVT_SPIN_DOWN(winid, func) \
+    wx__DECLARE_EVT1(wxEVT_SPIN_DOWN, winid, wxSpinEventHandler(func))
+#define EVT_SPIN(winid, func) \
+    wx__DECLARE_EVT1(wxEVT_SPIN, winid, wxSpinEventHandler(func))

 
 #endif // wxUSE_SPINBTN
 
 
 #endif // wxUSE_SPINBTN