removed redundant code

[wxWidgets.git] / include / wx / fdrepdlg.h

diff --git a/include/wx/fdrepdlg.h b/include/wx/fdrepdlg.h
index 0d2da818e64f265dcff39975ae37487222a5ab99..9b83c0584f6eb70867b366eb284e9cf788c7c342 100644 (file)
--- a/include/wx/fdrepdlg.h
+++ b/include/wx/fdrepdlg.h
@@ -1,8 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        wx/msw/fdrepdlg.h
+// Name:        wx/fdrepdlg.h

 // Purpose:     wxFindReplaceDialog class
 // 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:
 // Copyright:   (c) Markus Greither
 // Created:     23/03/2001
 // RCS-ID:
 // Copyright:   (c) Markus Greither


@@ -22,6 +22,7 @@
 
 #include "wx/dialog.h"
 
 
 #include "wx/dialog.h"
 

+class WXDLLEXPORT wxFindDialogEvent;

 class WXDLLEXPORT wxFindReplaceDialog;
 class WXDLLEXPORT wxFindReplaceData;
 class WXDLLEXPORT wxFindReplaceDialogImpl;
 class WXDLLEXPORT wxFindReplaceDialog;
 class WXDLLEXPORT wxFindReplaceData;
 class WXDLLEXPORT wxFindReplaceDialogImpl;


@@ -37,7 +38,7 @@ enum wxFindReplaceFlags
     wxFR_DOWN       = 1,
 
     // whole word search/replace selected
     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
 
     // case sensitive search/replace selected (otherwise - case insensitive)
     wxFR_MATCHCASE  = 4


@@ -66,8 +67,8 @@ enum wxFindReplaceDialogStyles
 class WXDLLEXPORT wxFindReplaceData : public wxObject
 {
 public:
 class WXDLLEXPORT wxFindReplaceData : public wxObject
 {
 public:

-    wxFindReplaceData() { }
-    wxFindReplaceData(wxUint32 flags) { SetFlags(flags); }
+    wxFindReplaceData() { Init(); }
+    wxFindReplaceData(wxUint32 flags) { Init(); SetFlags(flags); }

 
     // accessors
     const wxString& GetFindString() { return m_FindWhat; }
 
     // accessors
     const wxString& GetFindString() { return m_FindWhat; }


@@ -81,62 +82,59 @@ public:
     void SetFindString(const wxString& str) { m_FindWhat = str; }
     void SetReplaceString(const wxString& str) { m_ReplaceWith = str; }
 
     void SetFindString(const wxString& str) { m_FindWhat = str; }
     void SetReplaceString(const wxString& str) { m_ReplaceWith = str; }
 

+protected:
+    void Init();
+

 private:
     wxUint32 m_Flags;
     wxString m_FindWhat,
              m_ReplaceWith;
 
 private:
     wxUint32 m_Flags;
     wxString m_FindWhat,
              m_ReplaceWith;
 

-    friend class wxFindReplaceDialog;
+    friend class wxFindReplaceDialogBase;

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------

-// wxFindReplaceDialog: dialog for searching / replacing text
+// wxFindReplaceDialogBase

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxFindReplaceDialog : public wxDialog
+class WXDLLEXPORT wxFindReplaceDialogBase : public wxDialog

 {
 public:
     // ctors and such
 {
 public:
     // ctors and such

-    wxFindReplaceDialog() { Init(); }
-    wxFindReplaceDialog(wxWindow *parent,
-                        wxFindReplaceData *data,
-                        const wxString &title);
+    wxFindReplaceDialogBase() { m_FindReplaceData = NULL; }
+    wxFindReplaceDialogBase(wxWindow * WXUNUSED(parent),
+                            wxFindReplaceData *data,
+                            const wxString& WXUNUSED(title),
+                            int WXUNUSED(style) = 0)
+    {
+        m_FindReplaceData = data;
+    }

 
 

-    bool Create(wxWindow *parent,
-                wxFindReplaceData *data,
-                const wxString &title);
-
-    virtual ~wxFindReplaceDialog();
+    virtual ~wxFindReplaceDialogBase();

 
     // find dialog data access
     const wxFindReplaceData *GetData() const { return m_FindReplaceData; }
 
     // find dialog data access
     const wxFindReplaceData *GetData() const { return m_FindReplaceData; }

-    void SetData(wxFindReplaceData *data);
-
-    // implementation only from now on
+    void SetData(wxFindReplaceData *data) { m_FindReplaceData = data; }

 
 

-    wxFindReplaceDialogImpl *GetImpl() const { return m_impl; }
-
-    // override some base class virtuals
-    virtual bool Show(bool show);
-    virtual void SetTitle( const wxString& title);
-    virtual wxString GetTitle() const;
+    // implementation only, don't use
+    void Send(wxFindDialogEvent& event);

 
 protected:
 
 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);
-
-    void Init();
+    wxFindReplaceData *m_FindReplaceData;

 
 

-    wxFindReplaceData      *m_FindReplaceData;
-    wxString                m_title;
+    // the last string we searched for
+    wxString m_lastSearch;
+};

 
 

-    wxFindReplaceDialogImpl *m_impl;
+// include wxFindReplaceDialog declaration
+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
+    #include "wx/msw/fdrepdlg.h"
+#else
+    #define wxGenericFindReplaceDialog wxFindReplaceDialog
+    #define sm_classwxGenericFindReplaceDialog sm_classwxFindReplaceDialog

 
 

-    DECLARE_DYNAMIC_CLASS(wxFindReplaceDialog)
-};
+    #include "wx/generic/fdrepdlg.h"
+#endif

 
 // ----------------------------------------------------------------------------
 // wxFindReplaceDialog events
 
 // ----------------------------------------------------------------------------
 // wxFindReplaceDialog events


@@ -152,6 +150,9 @@ public:
     wxString GetFindString() const { return GetString(); }
     const wxString& GetReplaceString() const { return m_strReplace; }
 
     wxString GetFindString() const { return GetString(); }
     const wxString& GetReplaceString() const { return m_strReplace; }
 

+    wxFindReplaceDialog *GetDialog() const
+        { return wxStaticCast(GetEventObject(), wxFindReplaceDialog); }
+

     // implementation only
     void SetFlags(int flags) { SetInt(flags); }
     void SetFindString(const wxString& str) { SetString(str); }
     // implementation only
     void SetFlags(int flags) { SetInt(flags); }
     void SetFindString(const wxString& str) { SetString(str); }


@@ -164,14 +165,23 @@ private:
 };
 
 BEGIN_DECLARE_EVENT_TYPES()
 };
 
 BEGIN_DECLARE_EVENT_TYPES()

-    DECLARE_EVENT_TYPE(wxEVT_COMMAND_FIND_NEXT, 510)
-    DECLARE_EVENT_TYPE(wxEVT_COMMAND_REPLACE, 511)
-    DECLARE_EVENT_TYPE(wxEVT_COMMAND_REPLACE_ALL, 512)
-    DECLARE_EVENT_TYPE(wxEVT_COMMAND_FIND_CLOSE, 513)
+    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()
 
 typedef void (wxEvtHandler::*wxFindDialogEventFunction)(wxFindDialogEvent&);
 
 END_DECLARE_EVENT_TYPES()
 
 typedef void (wxEvtHandler::*wxFindDialogEventFunction)(wxFindDialogEvent&);
 

+#define EVT_FIND(id, fn) \
+    DECLARE_EVENT_TABLE_ENTRY( \
+        wxEVT_COMMAND_FIND, id, -1, \
+        (wxObjectEventFunction)(wxEventFunction)(wxFindDialogEventFunction) \
+        & fn, \
+        (wxObject *) NULL \
+    ),
+

 #define EVT_FIND_NEXT(id, fn) \
     DECLARE_EVENT_TABLE_ENTRY( \
         wxEVT_COMMAND_FIND_NEXT, id, -1, \
 #define EVT_FIND_NEXT(id, fn) \
     DECLARE_EVENT_TABLE_ENTRY( \
         wxEVT_COMMAND_FIND_NEXT, id, -1, \


@@ -180,9 +190,9 @@ typedef void (wxEvtHandler::*wxFindDialogEventFunction)(wxFindDialogEvent&);
         (wxObject *) NULL \
     ),
 
         (wxObject *) NULL \
     ),
 

-#define EVT_REPLACE(id, fn) \
+#define EVT_FIND_REPLACE(id, fn) \

     DECLARE_EVENT_TABLE_ENTRY( \
     DECLARE_EVENT_TABLE_ENTRY( \

-        wxEVT_COMMAND_REPLACE, id, -1, \
+        wxEVT_COMMAND_FIND_REPLACE, id, -1, \

         (wxObjectEventFunction)(wxEventFunction)(wxFindDialogEventFunction) \
         & fn, \
         (wxObject *) NULL \
         (wxObjectEventFunction)(wxEventFunction)(wxFindDialogEventFunction) \
         & fn, \
         (wxObject *) NULL \


@@ -190,13 +200,13 @@ typedef void (wxEvtHandler::*wxFindDialogEventFunction)(wxFindDialogEvent&);
 
 #define EVT_FIND_REPLACE_ALL(id, fn) \
     DECLARE_EVENT_TABLE_ENTRY( \
 
 #define EVT_FIND_REPLACE_ALL(id, fn) \
     DECLARE_EVENT_TABLE_ENTRY( \

-        wxEVT_COMMAND_REPLACE_ALL, id, -1, \
+        wxEVT_COMMAND_FIND_REPLACE_ALL, id, -1, \

         (wxObjectEventFunction)(wxEventFunction)(wxFindDialogEventFunction) \
         & fn, \
         (wxObject *) NULL \
     ),
 
         (wxObjectEventFunction)(wxEventFunction)(wxFindDialogEventFunction) \
         & fn, \
         (wxObject *) NULL \
     ),
 

-#define EVT_FIND_FIND_CLOSE(id, fn) \
+#define EVT_FIND_CLOSE(id, fn) \

     DECLARE_EVENT_TABLE_ENTRY( \
         wxEVT_COMMAND_FIND_CLOSE, id, -1, \
         (wxObjectEventFunction)(wxEventFunction)(wxFindDialogEventFunction) \
     DECLARE_EVENT_TABLE_ENTRY( \
         wxEVT_COMMAND_FIND_CLOSE, id, -1, \
         (wxObjectEventFunction)(wxEventFunction)(wxFindDialogEventFunction) \