X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d422d01eec769f5339087b4b3ad352d3d164bf1b..19e30148e18cc99296b26503c155e5cef59045f4:/include/wx/spinbutt.h

diff --git a/include/wx/spinbutt.h b/include/wx/spinbutt.h
index 02f38a74b0..52928d24d4 100644
--- a/include/wx/spinbutt.h
+++ b/include/wx/spinbutt.h
@@ -12,22 +12,19 @@
 #ifndef _WX_SPINBUTT_H_BASE_
 #define _WX_SPINBUTT_H_BASE_
 
-#ifdef __GNUG__
-#pragma interface "spinbutbase.h"
-#pragma implementation "spinbutbase.h"
-#endif
-
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 
 #include "wx/defs.h"
 
-#ifdef wxUSE_SPINBTN
+#if wxUSE_SPINBTN
 
 #include "wx/control.h"
 #include "wx/event.h"
 
+#define wxSPIN_BUTTON_NAME _T("wxSpinButton")
+
 // ----------------------------------------------------------------------------
 //  The wxSpinButton is like a small scrollbar than is often placed next
 //  to a text control.
@@ -57,6 +54,9 @@ public:
         m_max = maxVal;
     }
 
+    // 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()
@@ -74,14 +74,14 @@ protected:
 // include the declaration of the real class
 // ----------------------------------------------------------------------------
 
-#if defined(__WXMSW__)
+#if defined(__WXUNIVERSAL__)
+    #include "wx/univ/spinbutt.h"
+#elif defined(__WXMSW__) && defined(__WIN95__)
     #include "wx/msw/spinbutt.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/spinbutt.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/spinbutt.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/spinbutt.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/spinbutt.h"
 #elif defined(__WXPM__)
@@ -96,8 +96,6 @@ protected:
 
 class WXDLLEXPORT wxSpinEvent : public wxNotifyEvent
 {
-    DECLARE_DYNAMIC_CLASS(wxSpinEvent)
-
 public:
     wxSpinEvent(wxEventType commandType = wxEVT_NULL, int id = 0)
            : wxNotifyEvent(commandType, id)
@@ -107,20 +105,20 @@ public:
     // get the current value of the control
     int GetPosition() const { return m_commandInt; }
     void SetPosition(int pos) { m_commandInt = pos; }
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxSpinEvent)
 };
 
 typedef void (wxEvtHandler::*wxSpinEventFunction)(wxSpinEvent&);
 
 // macros for handling spin events
-#ifndef EVT_SPIN_UP
-#define EVT_SPIN_UP(id, func) { wxEVT_SCROLL_LINEUP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func },
-#endif
-#ifndef EVT_SPIN_DOWN
-#define EVT_SPIN_DOWN(id, func) { wxEVT_SCROLL_LINEDOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func },
-#endif
-#ifndef EVT_SPIN
-#define EVT_SPIN(id, func) { wxEVT_SCROLL_THUMBTRACK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func },
-#endif
+#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 ),
 
 #endif // wxUSE_SPINBTN