X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f8a5d9dac66cdb3c55fd8ce71d3efe26a137344e..2a45803fc3877afd0ae3ce356dfe216505165882:/include/wx/fdrepdlg.h?ds=sidebyside diff --git a/include/wx/fdrepdlg.h b/include/wx/fdrepdlg.h index 4652e0cd79..90f0adb8d9 100644 --- a/include/wx/fdrepdlg.h +++ b/include/wx/fdrepdlg.h @@ -4,7 +4,7 @@ // Author: Markus Greither and Vadim Zeitlin // Modified by: // Created: 23/03/2001 -// RCS-ID: +// RCS-ID: $Id$ // Copyright: (c) Markus Greither // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -67,8 +67,8 @@ public: wxFindReplaceData(wxUint32 flags) { Init(); SetFlags(flags); } // accessors - const wxString& GetFindString() { return m_FindWhat; } - const wxString& GetReplaceString() { return m_ReplaceWith; } + const wxString& GetFindString() const { return m_FindWhat; } + const wxString& GetReplaceString() const { return m_ReplaceWith; } int GetFlags() const { return m_Flags; } @@ -121,7 +121,7 @@ protected: // the last string we searched for wxString m_lastSearch; - DECLARE_NO_COPY_CLASS(wxFindReplaceDialogBase) + wxDECLARE_NO_COPY_CLASS(wxFindReplaceDialogBase); }; // include wxFindReplaceDialog declaration @@ -165,16 +165,16 @@ private: DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxFindDialogEvent) }; -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; +wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_FIND, wxFindDialogEvent ); +wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_FIND_NEXT, wxFindDialogEvent ); +wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_FIND_REPLACE, wxFindDialogEvent ); +wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_FIND_REPLACE_ALL, wxFindDialogEvent ); +wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_FIND_CLOSE, wxFindDialogEvent ); typedef void (wxEvtHandler::*wxFindDialogEventFunction)(wxFindDialogEvent&); #define wxFindDialogEventHandler(func) \ - (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxFindDialogEventFunction, &func) + wxEVENT_HANDLER_CAST(wxFindDialogEventFunction, func) #define EVT_FIND(id, fn) \ wx__DECLARE_EVT1(wxEVT_COMMAND_FIND, id, wxFindDialogEventHandler(fn))