X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/af49c4b8a2d3553e733e71c7dd3911881f4c1a2a..09b895cb4a954494063eb17d3dc302a654fd99e5:/include/wx/fdrepdlg.h?ds=inline diff --git a/include/wx/fdrepdlg.h b/include/wx/fdrepdlg.h index aa3965ff6b..52175bebe5 100644 --- a/include/wx/fdrepdlg.h +++ b/include/wx/fdrepdlg.h @@ -12,20 +12,16 @@ #ifndef _WX_FINDREPLACEDLG_H_ #define _WX_FINDREPLACEDLG_H_ -#if defined(__GNUG__) && !defined(__APPLE__) - #pragma interface "fdrepdlg.h" -#endif - #include "wx/defs.h" #if wxUSE_FINDREPLDLG #include "wx/dialog.h" -class WXDLLEXPORT wxFindDialogEvent; -class WXDLLEXPORT wxFindReplaceDialog; -class WXDLLEXPORT wxFindReplaceData; -class WXDLLEXPORT wxFindReplaceDialogImpl; +class WXDLLIMPEXP_FWD_CORE wxFindDialogEvent; +class WXDLLIMPEXP_FWD_CORE wxFindReplaceDialog; +class WXDLLIMPEXP_FWD_CORE wxFindReplaceData; +class WXDLLIMPEXP_FWD_CORE wxFindReplaceDialogImpl; // ---------------------------------------------------------------------------- // Flags for wxFindReplaceData.Flags @@ -64,7 +60,7 @@ enum wxFindReplaceDialogStyles // wxFindReplaceData: holds Setup Data/Feedback Data for wxFindReplaceDialog // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxFindReplaceData : public wxObject +class WXDLLIMPEXP_CORE wxFindReplaceData : public wxObject { public: wxFindReplaceData() { Init(); } @@ -97,7 +93,7 @@ private: // wxFindReplaceDialogBase // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxFindReplaceDialogBase : public wxDialog +class WXDLLIMPEXP_CORE wxFindReplaceDialogBase : public wxDialog { public: // ctors and such @@ -124,14 +120,15 @@ protected: // the last string we searched for wxString m_lastSearch; + + DECLARE_NO_COPY_CLASS(wxFindReplaceDialogBase) }; // include wxFindReplaceDialog declaration -#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) +#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) && !defined(__WXWINCE__) #include "wx/msw/fdrepdlg.h" #else #define wxGenericFindReplaceDialog wxFindReplaceDialog - #define sm_classwxGenericFindReplaceDialog sm_classwxFindReplaceDialog #include "wx/generic/fdrepdlg.h" #endif @@ -140,7 +137,7 @@ protected: // wxFindReplaceDialog events // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxFindDialogEvent : public wxCommandEvent +class WXDLLIMPEXP_CORE wxFindDialogEvent : public wxCommandEvent { public: wxFindDialogEvent(wxEventType commandType = wxEVT_NULL, int id = 0) @@ -161,58 +158,34 @@ public: private: wxString m_strReplace; - DECLARE_DYNAMIC_CLASS(wxFindDialogEvent) + DECLARE_DYNAMIC_CLASS_NO_COPY(wxFindDialogEvent) }; -BEGIN_DECLARE_EVENT_TYPES() - DECLARE_EVENT_TYPE(wxEVT_COMMAND_FIND, 510) - DECLARE_EVENT_TYPE(wxEVT_COMMAND_FIND_NEXT, 511) - DECLARE_EVENT_TYPE(wxEVT_COMMAND_FIND_REPLACE, 512) - DECLARE_EVENT_TYPE(wxEVT_COMMAND_FIND_REPLACE_ALL, 513) - DECLARE_EVENT_TYPE(wxEVT_COMMAND_FIND_CLOSE, 514) -END_DECLARE_EVENT_TYPES() +extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_FIND; +extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_FIND_NEXT; +extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_FIND_REPLACE; +extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_FIND_REPLACE_ALL; +extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_FIND_CLOSE; 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