X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12f190b09c5c1e25cfd8a6156d8d43f0b6647521..eedc82f4e96c7f8f0b24addbfd6b4429c9587631:/include/wx/generic/sashwin.h diff --git a/include/wx/generic/sashwin.h b/include/wx/generic/sashwin.h index dc7c8a6a2e..1c9a5b5b93 100644 --- a/include/wx/generic/sashwin.h +++ b/include/wx/generic/sashwin.h @@ -14,7 +14,7 @@ #ifndef _WX_SASHWIN_H_G_ #define _WX_SASHWIN_H_G_ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "sashwin.h" #endif @@ -239,9 +239,9 @@ private: typedef void (wxEvtHandler::*wxSashEventFunction)(wxSashEvent&); #define EVT_SASH_DRAGGED(id, fn) \ - DECLARE_EVENT_TABLE_ENTRY( wxEVT_SASH_DRAGGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSashEventFunction) & fn, NULL ), + DECLARE_EVENT_TABLE_ENTRY( wxEVT_SASH_DRAGGED, id, -1, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxSashEventFunction, & fn ), NULL ), #define EVT_SASH_DRAGGED_RANGE(id1, id2, fn) \ - DECLARE_EVENT_TABLE_ENTRY( wxEVT_SASH_DRAGGED, id1, id2, (wxObjectEventFunction) (wxEventFunction) (wxSashEventFunction) & fn, NULL ), + DECLARE_EVENT_TABLE_ENTRY( wxEVT_SASH_DRAGGED, id1, id2, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxSashEventFunction, & fn ), NULL ), #endif // wxUSE_SASH