Use /bin/echo for creation of Mac OS X PkgInfo files.

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

diff --git a/include/wx/spinbutt.h b/include/wx/spinbutt.h
index 164eaa53d9e35c1dea8881120930f0b67dacf85b..899bacea15bea1e4c7f4fe6cbf4af70a2ac3ad5a 100644 (file)
--- a/include/wx/spinbutt.h
+++ b/include/wx/spinbutt.h
@@ -22,13 +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")
-
-class WXDLLIMPEXP_FWD_CORE wxSpinEvent;
-wxDECLARE_EXPORTED_EVENT_REFERENCE( WXDLLIMPEXP_CORE, wxEVT_SPIN_UP,   wxSpinEvent )
-wxDECLARE_EXPORTED_EVENT_REFERENCE( WXDLLIMPEXP_CORE, wxEVT_SPIN_DOWN, wxSpinEvent )
-wxDECLARE_EXPORTED_EVENT_REFERENCE( WXDLLIMPEXP_CORE, wxEVT_SPIN,      wxSpinEvent )
+#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


@@ -51,6 +47,7 @@ public:
     virtual int GetValue() const = 0;
     virtual int GetMin() const { return m_min; }
     virtual int GetMax() const { return m_max; }
     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;


@@ -61,6 +58,7 @@ public:
         m_min = minVal;
         m_max = 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; }
 
     // is this spin button vertically oriented?
     bool IsVertical() const { return (m_windowStyle & wxSP_VERTICAL) != 0; }


@@ -70,7 +68,7 @@ protected:
     int   m_min;
     int   m_max;
 
     int   m_min;
     int   m_max;
 

-    DECLARE_NO_COPY_CLASS(wxSpinButtonBase)
+    wxDECLARE_NO_COPY_CLASS(wxSpinButtonBase);

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


@@ -133,11 +131,11 @@ typedef void (wxEvtHandler::*wxSpinEventFunction)(wxSpinEvent&);
 // (because of undefined initialization order of the globals defined in
 // different translation units) references in them
 #define EVT_SPIN_UP(winid, func) \
 // (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_SCROLL_LINEUP, winid, wxSpinEventHandler(func))
+    wx__DECLARE_EVT1(wxEVT_SPIN_UP, winid, wxSpinEventHandler(func))

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

-    wx__DECLARE_EVT1(wxEVT_SCROLL_LINEDOWN, winid, wxSpinEventHandler(func))
+    wx__DECLARE_EVT1(wxEVT_SPIN_DOWN, winid, wxSpinEventHandler(func))

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

-    wx__DECLARE_EVT1(wxEVT_SCROLL_THUMBTRACK, winid, wxSpinEventHandler(func))
+    wx__DECLARE_EVT1(wxEVT_SPIN, winid, wxSpinEventHandler(func))

 
 #endif // wxUSE_SPINBTN
 
 
 #endif // wxUSE_SPINBTN