X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/717b9bf234a20c491e0c9ee8f2c1bffad56a59c5..1ec46a5b35233f3c69c5b73e4b0b36f44c650633:/include/wx/spinbutt.h?ds=sidebyside diff --git a/include/wx/spinbutt.h b/include/wx/spinbutt.h index f28d46ce62..5f8026b488 100644 --- a/include/wx/spinbutt.h +++ b/include/wx/spinbutt.h @@ -12,13 +12,19 @@ #ifndef _WX_SPINBUTT_H_BASE_ #define _WX_SPINBUTT_H_BASE_ +#ifdef __GNUG__ + #if !defined(__WXMOTIF__) && !defined(__WXMAC__) // because there is no matching .cpp + #pragma interface "spinbutbase.h" + #endif +#endif + // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- #include "wx/defs.h" -#ifdef wxUSE_SPINBTN +#if wxUSE_SPINBTN #include "wx/control.h" #include "wx/event.h" @@ -107,15 +113,12 @@ public: 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