Compile fix for the version of VC8 included in the 2003 PSDK.

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

diff --git a/include/wx/fdrepdlg.h b/include/wx/fdrepdlg.h
index 0d2da818e64f265dcff39975ae37487222a5ab99..2adda0cbbff610a025e1a9b8c2ac7856a2a8b712 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


@@ -12,16 +12,13 @@
 #ifndef _WX_FINDREPLACEDLG_H_
 #define _WX_FINDREPLACEDLG_H_
 
 #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"
 
 #include "wx/defs.h"
 
 #if wxUSE_FINDREPLDLG
 
 #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 +34,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 +63,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 +78,60 @@ 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);
+    wxFindReplaceData *m_FindReplaceData;

 
 

-    void Init();
+    // the last string we searched for
+    wxString m_lastSearch;

 
 

-    wxFindReplaceData      *m_FindReplaceData;
-    wxString                m_title;
+    DECLARE_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
 
 // ----------------------------------------------------------------------------
 // wxFindReplaceDialog events


@@ -152,6 +147,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); }


@@ -160,49 +158,36 @@ public:
 private:
     wxString m_strReplace;
 
 private:
     wxString m_strReplace;
 

-    DECLARE_DYNAMIC_CLASS(wxFindDialogEvent)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxFindDialogEvent)

 };
 
 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 wxFindDialogEventHandler(func) \
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxFindDialogEventFunction, &func)
+
+#define EVT_FIND(id, fn) \
+    wx__DECLARE_EVT1(wxEVT_COMMAND_FIND, id, wxFindDialogEventHandler(fn))
+

 #define EVT_FIND_NEXT(id, fn) \
 #define EVT_FIND_NEXT(id, fn) \

-    DECLARE_EVENT_TABLE_ENTRY( \
-        wxEVT_COMMAND_FIND_NEXT, id, -1, \
-        (wxObjectEventFunction)(wxEventFunction)(wxFindDialogEventFunction) \
-        & fn, \
-        (wxObject *) NULL \
-    ),
-
-#define EVT_REPLACE(id, fn) \
-    DECLARE_EVENT_TABLE_ENTRY( \
-        wxEVT_COMMAND_REPLACE, id, -1, \
-        (wxObjectEventFunction)(wxEventFunction)(wxFindDialogEventFunction) \
-        & fn, \
-        (wxObject *) NULL \
-    ),
+    wx__DECLARE_EVT1(wxEVT_COMMAND_FIND_NEXT, id, wxFindDialogEventHandler(fn))
+
+#define EVT_FIND_REPLACE(id, fn) \
+    wx__DECLARE_EVT1(wxEVT_COMMAND_FIND_REPLACE, id, wxFindDialogEventHandler(fn))

 
 #define EVT_FIND_REPLACE_ALL(id, fn) \
 
 #define EVT_FIND_REPLACE_ALL(id, fn) \

-    DECLARE_EVENT_TABLE_ENTRY( \
-        wxEVT_COMMAND_REPLACE_ALL, id, -1, \
-        (wxObjectEventFunction)(wxEventFunction)(wxFindDialogEventFunction) \
-        & fn, \
-        (wxObject *) NULL \
-    ),
-
-#define EVT_FIND_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_REPLACE_ALL, id, wxFindDialogEventHandler(fn))
+
+#define EVT_FIND_CLOSE(id, fn) \
+    wx__DECLARE_EVT1(wxEVT_COMMAND_FIND_CLOSE, id, wxFindDialogEventHandler(fn))

 
 #endif // wxUSE_FINDREPLDLG
 
 
 #endif // wxUSE_FINDREPLDLG