removed wxUSE_XPM_IN_MSW from setup0.h

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

diff --git a/include/wx/spinbutt.h b/include/wx/spinbutt.h
index 5df76fb0a318e44205391044f58ba22dbf0ce2e1..5f8026b48896ab8d8774d73951f9ac1d548bd998 100644 (file)
--- a/include/wx/spinbutt.h
+++ b/include/wx/spinbutt.h
@@ -13,9 +13,9 @@
 #define _WX_SPINBUTT_H_BASE_
 
 #ifdef __GNUG__
-    #ifndef __WXMOTIF__ // because there is no matching .cpp for Motif
+    #if !defined(__WXMOTIF__) && !defined(__WXMAC__) // because there is no matching .cpp
         #pragma interface "spinbutbase.h"
-    #endif // Motif
+    #endif
 #endif
 
 // ----------------------------------------------------------------------------
@@ -113,18 +113,12 @@ public:
 typedef void (wxEvtHandler::*wxSpinEventFunction)(wxSpinEvent&);
 
 // macros for handling spin events
-#ifndef EVT_SPIN_UP
 #define EVT_SPIN_UP(id, func) \
-    wxEventTableEntry( wxEVT_SCROLL_LINEUP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func ),
-#endif
-#ifndef EVT_SPIN_DOWN
+    DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_LINEUP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func, NULL ),
 #define EVT_SPIN_DOWN(id, func) \
-    wxEventTableEntry( wxEVT_SCROLL_LINEDOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func ),
-#endif
-#ifndef EVT_SPIN
+    DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_LINEDOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func, NULL ),
 #define EVT_SPIN(id, func) \
-    wxEventTableEntry( wxEVT_SCROLL_THUMBTRACK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func ),
-#endif
+    DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_THUMBTRACK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func, NULL ),
 
 #endif // wxUSE_SPINBTN