X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/761989ffb536ab51e977142aa018064ef32b539b..a7689c49fe02c0c065facf736ab28b19f5997b7c:/include/wx/fdrepdlg.h?ds=sidebyside diff --git a/include/wx/fdrepdlg.h b/include/wx/fdrepdlg.h index f290451a47..90f0adb8d9 100644 --- a/include/wx/fdrepdlg.h +++ b/include/wx/fdrepdlg.h @@ -1,10 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/fdrepdlg.h +// Name: wx/fdrepdlg.h // Purpose: wxFindReplaceDialog class -// Author: Markus Greither -// Modified by: 31.07.01: VZ: integrated into wxWindows +// Author: Markus Greither and Vadim Zeitlin +// Modified by: // Created: 23/03/2001 -// RCS-ID: +// RCS-ID: $Id$ // Copyright: (c) Markus Greither // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -12,19 +12,16 @@ #ifndef _WX_FINDREPLACEDLG_H_ #define _WX_FINDREPLACEDLG_H_ -#ifdef __GNUG__ - #pragma interface "fdrepdlg.h" -#endif - #include "wx/defs.h" #if wxUSE_FINDREPLDLG #include "wx/dialog.h" -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 @@ -37,7 +34,7 @@ enum wxFindReplaceFlags wxFR_DOWN = 1, // whole word search/replace selected - wxFR_WHOLEWORD = 2, + wxFR_WHOLEWORD = 2, // case sensitive search/replace selected (otherwise - case insensitive) wxFR_MATCHCASE = 4 @@ -63,15 +60,15 @@ enum wxFindReplaceDialogStyles // wxFindReplaceData: holds Setup Data/Feedback Data for wxFindReplaceDialog // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxFindReplaceData : public wxObject +class WXDLLIMPEXP_CORE wxFindReplaceData : public wxObject { public: wxFindReplaceData() { Init(); } 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; } @@ -89,69 +86,64 @@ private: wxString m_FindWhat, m_ReplaceWith; - friend class wxFindReplaceDialog; + friend class wxFindReplaceDialogBase; }; // ---------------------------------------------------------------------------- -// wxFindReplaceDialog: dialog for searching / replacing text +// wxFindReplaceDialogBase // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxFindReplaceDialog : public wxDialog +class WXDLLIMPEXP_CORE wxFindReplaceDialogBase : public wxDialog { public: // ctors and such - wxFindReplaceDialog() { Init(); } - wxFindReplaceDialog(wxWindow *parent, - wxFindReplaceData *data, - const wxString &title, - int style = 0); - - bool Create(wxWindow *parent, - wxFindReplaceData *data, - const wxString &title, - int style = 0); + wxFindReplaceDialogBase() { m_FindReplaceData = NULL; } + wxFindReplaceDialogBase(wxWindow * WXUNUSED(parent), + wxFindReplaceData *data, + const wxString& WXUNUSED(title), + int WXUNUSED(style) = 0) + { + m_FindReplaceData = data; + } - virtual ~wxFindReplaceDialog(); + virtual ~wxFindReplaceDialogBase(); // find dialog data access const wxFindReplaceData *GetData() const { return m_FindReplaceData; } - void SetData(wxFindReplaceData *data); + void SetData(wxFindReplaceData *data) { m_FindReplaceData = data; } - // implementation only from now on - - wxFindReplaceDialogImpl *GetImpl() const { return m_impl; } - - // override some base class virtuals - virtual bool Show(bool show = TRUE); - virtual void SetTitle( const wxString& title); - virtual wxString GetTitle() const; + // implementation only, don't use + void Send(wxFindDialogEvent& event); protected: - virtual void DoGetSize(int *width, int *height) const; - virtual void DoGetClientSize(int *width, int *height) const; - virtual void DoSetSize(int x, int y, - int width, int height, - int sizeFlags = wxSIZE_AUTO); + wxFindReplaceData *m_FindReplaceData; - void Init(); + // the last string we searched for + wxString m_lastSearch; - wxFindReplaceData *m_FindReplaceData; - wxString m_title; + wxDECLARE_NO_COPY_CLASS(wxFindReplaceDialogBase); +}; - wxFindReplaceDialogImpl *m_impl; +// include wxFindReplaceDialog declaration +#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) && !defined(__WXWINCE__) + #include "wx/msw/fdrepdlg.h" +#else + #define wxGenericFindReplaceDialog wxFindReplaceDialog - DECLARE_DYNAMIC_CLASS(wxFindReplaceDialog) -}; + #include "wx/generic/fdrepdlg.h" +#endif // ---------------------------------------------------------------------------- // wxFindReplaceDialog events // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxFindDialogEvent : public wxCommandEvent +class WXDLLIMPEXP_CORE wxFindDialogEvent : public wxCommandEvent { public: wxFindDialogEvent(wxEventType commandType = wxEVT_NULL, int id = 0) : wxCommandEvent(commandType, id) { } + wxFindDialogEvent(const wxFindDialogEvent& event) + : wxCommandEvent(event), m_strReplace(event.m_strReplace) { } int GetFlags() const { return GetInt(); } wxString GetFindString() const { return GetString(); } @@ -165,61 +157,39 @@ public: void SetFindString(const wxString& str) { SetString(str); } void SetReplaceString(const wxString& str) { m_strReplace = str; } + virtual wxEvent *Clone() const { return new wxFindDialogEvent(*this); } + private: wxString m_strReplace; - DECLARE_DYNAMIC_CLASS(wxFindDialogEvent) + DECLARE_DYNAMIC_CLASS_NO_ASSIGN(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() +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) \ + wxEVENT_HANDLER_CAST(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