MSW fixes; added wxUSE_XPM to wxUniv's setup.h so now widgets sample works

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

diff --git a/include/wx/spinbutt.h b/include/wx/spinbutt.h
index d1e04f8104ac4d0407fd0754e1c60e2534124652..52bf67cbeb4d8f12202a50461b01b8c01361e7c5 100644 (file)
--- a/include/wx/spinbutt.h
+++ b/include/wx/spinbutt.h
@@ -13,7 +13,9 @@
 #define _WX_SPINBUTT_H_BASE_
 
 #ifdef __GNUG__
-    #pragma interface "spinbutbase.h"
+    #if !defined(__WXMOTIF__) && !defined(__WXMAC__) // because there is no matching .cpp
+        #pragma interface "spinbutbase.h"
+    #endif
 #endif
 
 // ----------------------------------------------------------------------------
@@ -22,11 +24,13 @@
 
 #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.
@@ -56,6 +60,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()
@@ -73,7 +80,9 @@ protected:
 // include the declaration of the real class
 // ----------------------------------------------------------------------------
 
-#if defined(__WXMSW__)
+#if defined(__WXUNIVERSAL__)
+    #include "wx/univ/spinbutt.h"
+#elif defined(__WXMSW__)
     #include "wx/msw/spinbutt.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/spinbutt.h"
@@ -95,8 +104,6 @@ protected:
 
 class WXDLLEXPORT wxSpinEvent : public wxNotifyEvent
 {
-    DECLARE_DYNAMIC_CLASS(wxSpinEvent)
-
 public:
     wxSpinEvent(wxEventType commandType = wxEVT_NULL, int id = 0)
            : wxNotifyEvent(commandType, id)
@@ -106,20 +113,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