X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b7245f129a1d9bf8976144df02c66bb42a5c4fcc..2e9760c0ee8b20ea5c85e7cacd016e84957fcebe:/include/wx/spinbutt.h?ds=sidebyside diff --git a/include/wx/spinbutt.h b/include/wx/spinbutt.h index 76a7b8b187..5f8026b488 100644 --- 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 // ---------------------------------------------------------------------------- @@ -114,11 +114,11 @@ typedef void (wxEvtHandler::*wxSpinEventFunction)(wxSpinEvent&); // macros for handling spin events #define EVT_SPIN_UP(id, func) \ - wxEventTableEntry( wxEVT_SCROLL_LINEUP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func, NULL ), + 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, NULL ), + 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, NULL ), + DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_THUMBTRACK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func, NULL ), #endif // wxUSE_SPINBTN