X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/086b3a5b02f91b0553970b7c68c3bbde7c047ecc..f5a1953b341d16396763bee067ccdd96108f3aad:/include/wx/fdrepdlg.h?ds=sidebyside diff --git a/include/wx/fdrepdlg.h b/include/wx/fdrepdlg.h index f7b3d94185..4b5fb6cb59 100644 --- a/include/wx/fdrepdlg.h +++ b/include/wx/fdrepdlg.h @@ -12,7 +12,7 @@ #ifndef _WX_FINDREPLACEDLG_H_ #define _WX_FINDREPLACEDLG_H_ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "fdrepdlg.h" #endif @@ -133,7 +133,6 @@ protected: #include "wx/msw/fdrepdlg.h" #else #define wxGenericFindReplaceDialog wxFindReplaceDialog - #define sm_classwxGenericFindReplaceDialog sm_classwxFindReplaceDialog #include "wx/generic/fdrepdlg.h" #endif @@ -163,7 +162,7 @@ public: private: wxString m_strReplace; - DECLARE_DYNAMIC_CLASS(wxFindDialogEvent) + DECLARE_DYNAMIC_CLASS_NO_COPY(wxFindDialogEvent) }; BEGIN_DECLARE_EVENT_TYPES() @@ -176,45 +175,23 @@ END_DECLARE_EVENT_TYPES() typedef void (wxEvtHandler::*wxFindDialogEventFunction)(wxFindDialogEvent&); +#define wxFindDialogEventHandler(func) \ + (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxFindDialogEventFunction, &func) + #define EVT_FIND(id, fn) \ - DECLARE_EVENT_TABLE_ENTRY( \ - wxEVT_COMMAND_FIND, id, -1, \ - (wxObjectEventFunction)(wxEventFunction)(wxFindDialogEventFunction) \ - & fn, \ - (wxObject *) NULL \ - ), + wx__DECLARE_EVT1(wxEVT_COMMAND_FIND, id, wxFindDialogEventHandler(fn)) #define EVT_FIND_NEXT(id, fn) \ - DECLARE_EVENT_TABLE_ENTRY( \ - wxEVT_COMMAND_FIND_NEXT, id, -1, \ - (wxObjectEventFunction)(wxEventFunction)(wxFindDialogEventFunction) \ - & fn, \ - (wxObject *) NULL \ - ), + wx__DECLARE_EVT1(wxEVT_COMMAND_FIND_NEXT, id, wxFindDialogEventHandler(fn)) #define EVT_FIND_REPLACE(id, fn) \ - DECLARE_EVENT_TABLE_ENTRY( \ - wxEVT_COMMAND_FIND_REPLACE, id, -1, \ - (wxObjectEventFunction)(wxEventFunction)(wxFindDialogEventFunction) \ - & fn, \ - (wxObject *) NULL \ - ), + wx__DECLARE_EVT1(wxEVT_COMMAND_FIND_REPLACE, id, wxFindDialogEventHandler(fn)) #define EVT_FIND_REPLACE_ALL(id, fn) \ - DECLARE_EVENT_TABLE_ENTRY( \ - wxEVT_COMMAND_FIND_REPLACE_ALL, id, -1, \ - (wxObjectEventFunction)(wxEventFunction)(wxFindDialogEventFunction) \ - & fn, \ - (wxObject *) NULL \ - ), + wx__DECLARE_EVT1(wxEVT_COMMAND_FIND_REPLACE_ALL, id, wxFindDialogEventHandler(fn)) #define EVT_FIND_CLOSE(id, fn) \ - DECLARE_EVENT_TABLE_ENTRY( \ - wxEVT_COMMAND_FIND_CLOSE, id, -1, \ - (wxObjectEventFunction)(wxEventFunction)(wxFindDialogEventFunction) \ - & fn, \ - (wxObject *) NULL \ - ), + wx__DECLARE_EVT1(wxEVT_COMMAND_FIND_CLOSE, id, wxFindDialogEventHandler(fn)) #endif // wxUSE_FINDREPLDLG