added generic implementation and documentation for wxFindReplaceDialog

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11232 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

configure.in

@@ -700,6 +700,7 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_COLOURDLG=no
   DEFAULT_wxUSE_DIRDLG=no
   DEFAULT_wxUSE_FILEDLG=no
+  DEFAULT_wxUSE_FINDREPLDLG=no
   DEFAULT_wxUSE_FONTDLG=no
   DEFAULT_wxUSE_MSGDLG=no
   DEFAULT_wxUSE_NUMBERDLG=no
@@ -857,6 +858,7 @@ else
   DEFAULT_wxUSE_COLOURDLG=yes
   DEFAULT_wxUSE_DIRDLG=yes
   DEFAULT_wxUSE_FILEDLG=yes
+  DEFAULT_wxUSE_FINDREPLDLG=yes
   DEFAULT_wxUSE_FONTDLG=yes
   DEFAULT_wxUSE_MSGDLG=yes
   DEFAULT_wxUSE_NUMBERDLG=yes
@@ -1246,6 +1248,7 @@ WX_ARG_ENABLE(commondlg,   [  --enable-commondlg      use common dialogs (wxDirD
 WX_ARG_ENABLE(choicedlg,   [  --enable-choicedlg      use wxChoiceDialog], wxUSE_CHOICEDLG)
 WX_ARG_ENABLE(coldlg,      [  --enable-coldlg         use wxColourDialog], wxUSE_COLOURDLG)
 WX_ARG_ENABLE(filedlg,     [  --enable-filedlg        use wxFileDialog], wxUSE_FILEDLG)
+WX_ARG_ENABLE(filedlg,     [  --enable-finddlg        use wxFindReplaceDialog], wxUSE_FINDREPLDLG)
 WX_ARG_ENABLE(fontdlg,     [  --enable-fontdlg        use wxFontDialog], wxUSE_FONTDLG)
 WX_ARG_ENABLE(dirdlg,      [  --enable-dirdlg         use wxDirDialog], wxUSE_DIRDLG)
 WX_ARG_ENABLE(msgdlg,      [  --enable-msgdlg         use wxMessageDialog], wxUSE_MSGDLG)
@@ -4387,6 +4390,10 @@ if test "$wxUSE_FILEDLG" = "yes"; then
     AC_DEFINE(wxUSE_FILEDLG)
 fi
 
+if test "$wxUSE_FINDREPLDLG" = "yes"; then
+    AC_DEFINE(wxUSE_FINDREPLDLG)
+fi
+
 if test "$wxUSE_FONTDLG" = "yes"; then
     AC_DEFINE(wxUSE_FONTDLG)
 fi

distrib/msw/tmake/filelist.txt

@@ -62,6 +62,7 @@ dcpsg.cpp	Generic	NotMSW
 dirctrlg.cpp	Generic
 dirdlgg.cpp	Generic	NotWin32,NotOS2
 dragimgg.cpp	Generic	NotOS2
+fdrepdlg.cpp	Generic	NotMSW
 fontdlgg.cpp	Generic	Generic,NotOS2
 filedlgg.cpp	Generic	NotMSW,NotX,NotOS2
 grid.cpp	Generic
@@ -129,6 +130,7 @@ effects.cpp	Common
 encconv.cpp	Common	Base
 event.cpp	Common	Base
 extended.c	Common	Base
+fddlgcmn.cpp	Common
 ffile.cpp	Common	Base
 file.cpp	Common	Base
 fileconf.cpp	Common	Base
@@ -259,6 +261,7 @@ dropsrc.cpp	MSW	OLE
 droptgt.cpp	MSW	OLE
 enhmeta.cpp	MSW	Win32Only
 evtloop.cpp	MSW	LowLevel
+fdrepdlg.cpp	MSW	Win32Only
 filedlg.cpp	MSW
 font.cpp	MSW
 fontdlg.cpp	MSW
@@ -645,6 +648,7 @@ dynlib.h	WXH	Base
 encconv.h	WXH	Base
 event.h	WXH	Base
 expr.h	WXH
+fdrepdlg.h	WXH
 ffile.h	WXH	Base
 file.h	WXH	Base
 fileconf.h	WXH	Base
@@ -657,7 +661,6 @@ fontdlg.h	WXH
 fontenc.h	WXH	Base
 fontenum.h	WXH
 fontmap.h	WXH	Base
-fontdlg.h	WXH
 fontutil.h	WXH
 frame.h	WXH
 fs_inet.h	WXH	Base
@@ -964,6 +967,7 @@ dibutils.h	MSWH
 dirdlg.h	MSWH
 dragimag.h	MSWH
 enhmeta.h	MSWH	Win32Only
+fdrepdlg.h	MSWH
 filedlg.h	MSWH
 font.h	MSWH
 fontdlg.h	MSWH
@@ -1157,6 +1161,7 @@ dcpsg.h	GenericH
 dirctrlg.h	GenericH
 dirdlgg.h	GenericH	NotWin32
 dragimgg.h	GenericH	NotWin32
+fdrepdlg.h	GenericH	NotMSW
 fontdlgg.h	GenericH
 filedlgg.h	GenericH
 grid.h	GenericH

docs/changes.txt

@@ -11,6 +11,7 @@ wxBase:
 All (GUI):
 
 - support for virtual list control added
+- wxFindReplaceDialog added (based on work of Markus Greither)
 
 2.3.1
 -----

docs/latex/wx/category.tex

@@ -58,6 +58,7 @@ in an application.
 \twocolitem{\helpref{wxColourDialog}{wxcolourdialog}}{Colour chooser dialog}
 \twocolitem{\helpref{wxDirDialog}{wxdirdialog}}{Directory selector dialog}
 \twocolitem{\helpref{wxFileDialog}{wxfiledialog}}{File selector dialog}
+\twocolitem{\helpref{wxFindReplaceDialog}{wxfindreplacedialog}}{Text search/replace dialog}
 \twocolitem{\helpref{wxMultipleChoiceDialog}{wxmultiplechoicedialog}}{Dialog to get one or more selections from a list}
 \twocolitem{\helpref{wxSingleChoiceDialog}{wxsinglechoicedialog}}{Dialog to get a single selection from a list and return the string}
 \twocolitem{\helpref{wxTextEntryDialog}{wxtextentrydialog}}{Dialog to get a single line of text from the user}
@@ -198,6 +199,8 @@ An event object contains information about a specific event. Event handlers
 \twocolitem{\helpref{wxDropFilesEvent}{wxdropfilesevent}}{A drop files event}
 \twocolitem{\helpref{wxEraseEvent}{wxeraseevent}}{An erase background event}
 \twocolitem{\helpref{wxEvent}{wxevent}}{The event base class}
+\twocolitem{\helpref{wxFindDialogEvent}{wxfinddialogevent}}{Event sent by 
+\helpref{wxFindReplaceDialog}{wxfindreplacedialog}}
 \twocolitem{\helpref{wxFocusEvent}{wxfocusevent}}{A window focus event}
 \twocolitem{\helpref{wxKeyEvent}{wxkeyevent}}{A keypress event}
 \twocolitem{\helpref{wxIconizeEvent}{wxiconizeevent}}{An iconize/restore event}

docs/latex/wx/classes.tex

@@ -99,6 +99,7 @@
 \input flexsizr.tex
 \input fltinstr.tex
 \input fltoutst.tex
+\input fdrepdlg.tex
 \input focusevt.tex
 \input font.tex
 \input fontdlg.tex

docs/latex/wx/fdrepdlg.tex

@@ -0,0 +1,231 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Name:        fdrepdlg.tex
+%% Purpose:     wxFindReplaceDialog documentation
+%% Author:      Vadim Zeitlin
+%% Modified by:
+%% Created:     01.08.01
+%% RCS-ID:      $Id$
+%% Copyright:   (c) 2001 Vadim Zeitlin
+%% License:     wxWindows license
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\section{\class{wxFindDialogEvent}}\label{wxfinddialogevent}
+
+wxFindReplaceDialog events
+
+\wxheading{Derived from}
+
+\helpref{wxCommandEvent}{wxcommandevent}
+
+\wxheading{Include files}
+
+<wx/fdrepdlg.h>
+
+\wxheading{Event table macros}
+
+To process a command event from 
+\helpref{wxFindReplaceDialog}{wxfindreplacedialog}, use these event handler
+macros to direct input to member functions that take a wxFindDialogEvent
+argument. The {\it id} parameter is the identifier of the find dialog and you
+may usually specify $-1$ for it unless you plan to have several find dialogs
+sending events to the same owner window simultaneously.
+
+\twocolwidtha{7cm}
+\begin{twocollist}\itemsep=0pt
+\twocolitem{{\bf EVT\_FIND(id, func)}}{Find button was pressed in the dialog.}
+\twocolitem{{\bf EVT\_FIND\_NEXT(id, func)}}{Find next button was pressed in the dialog.}
+\twocolitem{{\bf EVT\_FIND\_REPLACE(id, func)}}{Replace button was pressed in the dialog.}
+\twocolitem{{\bf EVT\_FIND\_REPLACE\_ALL(id, func)}}{Replace all button was pressed in the dialog.}
+\twocolitem{{\bf EVT\_FIND\_CLOSE(id, func)}}{The dialog is being destroyed,
+any pointers to it cannot be used any longer.}
+\end{twocollist}%
+
+\latexignore{\rtfignore{\wxheading{Members}}}
+
+\membersection{wxFindDialogEvent::wxFindDialogEvent}\label{wxfinddialogeventwxfinddialogevent}
+
+\func{}{wxFindDialogEvent}{\param{wxEventType }{commandType = wxEVT\_NULL}, \param{int }{id = 0}}
+
+Constuctor used by wxWindows only.
+
+\membersection{wxFindDialogEvent::GetFlags}\label{wxfinddialogeventgetflags}
+
+\constfunc{int}{GetFlags}{\void}
+
+Get the currently selected flags: this is the combination of {\tt wxFR\_DOWN},
+{\tt wxFR\_WHOLEWORD} and {\tt wxFR\_MATCHCASE} flags.
+
+\membersection{wxFindDialogEvent::GetFindString}\label{wxfinddialogeventgetfindstring}
+
+\constfunc{wxString}{GetFindString}{\void}
+
+Return the string to find (never empty).
+
+\membersection{wxFindDialogEvent::GetReplaceString}\label{wxfinddialogeventgetreplacestring}
+
+\constfunc{const wxString\&}{GetReplaceString}{\void}
+
+Return the string to replace the search string with (only for replace and
+replace all events).
+
+\membersection{wxFindDialogEvent::GetDialog}\label{wxfinddialogeventgetdialog}
+
+\constfunc{wxFindReplaceDialog*}{GetDialog}{\void}
+
+Return the pointer to the dialog which generated this event.
+
+\section{\class{wxFindReplaceData}}\label{wxfindreplacedata}
+
+wxFindReplaceData holds the data for 
+\helpref{wxFindReplaceDialog}{wxfindreplacedialog}. It is used to initialize
+the dialog with the default values and will keep the last values from the
+dialog when it is closed. It is also updated each time a 
+\helpref{wxFindDialogEvent}{wxfinddialogevent} is generated so instead of
+using the wxFindDialogEvent methods you can also directly query this object.
+
+Note that all {\tt SetXXX()} methods may only be called before showing the
+dialog and calling them has no effect later.
+
+\wxheading{Include files}
+
+#include <wx/fdrepdlg.h>
+
+\wxheading{Derived from}
+
+\helpref{wxObject}{wxobject}
+
+\wxheading{Data structures}
+
+Flages used by 
+\helpref{wxFindReplaceData::GetFlags()}{wxfindreplacedatagetflags} and
+\helpref{wxFindDialogEvent::GetFlags()}{wxfinddialogeventgetflags}:
+
+\begin{verbatim}
+enum wxFindReplaceFlags
+{
+    // downward search/replace selected (otherwise - upwards)
+    wxFR_DOWN       = 1,
+
+    // whole word search/replace selected
+    wxFR_WHOLEWORD  = 2,
+
+    // case sensitive search/replace selected (otherwise - case insensitive)
+    wxFR_MATCHCASE  = 4
+}
+\end{verbatim}
+
+These flags can be specified in 
+\helpref{wxFindReplaceDialog ctor}{wxfindreplacedialogctor} or 
+\helpref{Create()}{wxfindreplacedialogcreate}:
+
+\begin{verbatim}
+enum wxFindReplaceDialogStyles
+{
+    // replace dialog (otherwise find dialog)
+    wxFR_REPLACEDIALOG = 1,
+
+    // don't allow changing the search direction
+    wxFR_NOUPDOWN      = 2,
+
+    // don't allow case sensitive searching
+    wxFR_NOMATCHCASE   = 4,
+
+    // don't allow whole word searching
+    wxFR_NOWHOLEWORD   = 8
+}
+\end{verbatim}
+
+\latexignore{\rtfignore{\wxheading{Members}}}
+
+\membersection{wxFindReplaceData::wxFindReplaceData}\label{wxfindreplacedatactor}
+
+\func{}{wxFindReplaceData}{\param{wxUint32 }{flags = 0}}
+
+Constuctor initializes the flags to default value ($0$).
+
+\membersection{wxFindReplaceData::GetFindString}\label{wxfindreplacedatagetfindstring}
+
+\func{const wxString\&}{GetFindString}{\void}
+
+Get the string to find.
+
+\membersection{wxFindReplaceData::GetReplaceString}\label{wxfindreplacedatagetreplacestring}
+
+\func{const wxString\&}{GetReplaceString}{\void}
+
+Get the replacement string.
+
+\membersection{wxFindReplaceData::GetFlags}\label{wxfindreplacedatagetflags}
+
+\constfunc{int}{GetFlags}{\void}
+
+Get the combination of {\tt wxFindReplaceFlags} values.
+
+\membersection{wxFindReplaceData::SetFlags}\label{wxfindreplacedatasetflags}
+
+\func{void}{SetFlags}{\param{wxUint32 }{flags}}
+
+Set the flags to use to initialize the controls of the dialog.
+
+\membersection{wxFindReplaceData::SetFindString}\label{wxfindreplacedatasetfindstring}
+
+\func{void}{SetFindString}{\param{const wxString\& }{str}}
+
+Set the string to find (used as initial value by the dialog).
+
+\membersection{wxFindReplaceData::SetReplaceString}\label{wxfindreplacedatasetreplacestring}
+
+\func{void}{SetReplaceString}{\param{const wxString\& }{str}}
+
+Set the replacement string (used as initial value by the dialog).
+
+\section{\class{wxFindReplaceDialog}}\label{wxfindreplacedialog}
+
+wxFindReplaceDialog is a standard modeless dialog which is used to allow the
+user to search for some text (and possible replace it with something else).
+The actual searching is supposed to be done in the owner window which is the
+parent of this dialog. Note that it means that unlike for the other standard
+dialogs this one {\bf must} have a parent window.
+
+Please see the dialogs sample for example of using it.
+
+\wxheading{Include files}
+
+#include <wx/fdrepdlg.h>
+
+\wxheading{Derived from}
+
+\helpref{wxDialog}{wxdialog}
+
+\latexignore{\rtfignore{\wxheading{Members}}}
+
+\membersection{wxFindReplaceDialog::wxFindReplaceDialog}\label{wxfindreplacedialogctor}
+
+\func{}{wxFindReplaceDialogBase}{\void}
+
+\func{}{wxFindReplaceDialogBase}{\param{wxWindow * }{parent}, \param{wxFindReplaceData* }{data}, \param{const wxString\& }{title}, \param{int }{style = 0}}
+
+After using default constructor \helpref{Created}{wxfindreplacedialogcreate} 
+must be called.
+
+The {\it parent} and {\it data} parameters must be non-{\tt NULL}.
+
+\membersection{wxFindReplaceDialogBase::\destruct{wxFindReplaceDialogBase}}\label{wxfindreplacedialogdtor}
+
+\func{}{\destruct{wxFindReplaceDialogBase}}{\void}
+
+Destructor.
+
+\func{bool}{Create}{\param{wxWindow * }{parent}, \param{wxFindReplaceData* }{data}, \param{const wxString\& }{title}, \param{int }{style = 0}}
+
+Creates the dialog and shows it on screen.
+
+The {\it parent} and {\it data} parameters must be non-{\tt NULL}.
+
+\membersection{wxFindReplaceDialogBase::GetData}\label{wxfindreplacedialoggetdata}
+
+\constfunc{const wxFindReplaceData*}{GetData}{\void}
+
+Get the \helpref{wxFindReplaceData}{wxfindreplacedata} object used by this
+dialog.
+

include/wx/fdrepdlg.h

@@ -1,8 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/fdrepdlg.h
+// Name:        wx/fdrepdlg.h
 // Purpose:     wxFindReplaceDialog class
-// Author:      Markus Greither
+// Author:      Markus Greither and Vadim Zeitlin
-// Modified by: 31.07.01: VZ: integrated into wxWindows
+// Modified by:
 // Created:     23/03/2001
 // RCS-ID:
 // Copyright:   (c) Markus Greither
@@ -22,6 +22,7 @@
 
 #include "wx/dialog.h"
 
+class WXDLLEXPORT wxFindDialogEvent;
 class WXDLLEXPORT wxFindReplaceDialog;
 class WXDLLEXPORT wxFindReplaceData;
 class WXDLLEXPORT wxFindReplaceDialogImpl;
@@ -37,7 +38,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
@@ -89,60 +90,52 @@ 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 WXDLLEXPORT wxFindReplaceDialogBase : public wxDialog
 {
 public:
     // ctors and such
-    wxFindReplaceDialog() { Init(); }
+    wxFindReplaceDialogBase() { m_FindReplaceData = NULL; }
-    wxFindReplaceDialog(wxWindow *parent,
+    wxFindReplaceDialogBase(wxWindow * WXUNUSED(parent),
-                        wxFindReplaceData *data,
+                            wxFindReplaceData *data,
-                        const wxString &title,
+                            const wxString& WXUNUSED(title),
-                        int style = 0);
+                            int WXUNUSED(style) = 0)
+    {
+        m_FindReplaceData = data;
+    }
 
-    bool Create(wxWindow *parent,
+    virtual ~wxFindReplaceDialogBase();
-                wxFindReplaceData *data,
-                const wxString &title,
-                int style = 0);
-
-    virtual ~wxFindReplaceDialog();
 
     // 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
+    // implementation only, don't use
-
+    void Send(wxFindDialogEvent& event);
-    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;
 
 protected:
-    virtual void DoGetSize(int *width, int *height) const;
+    wxFindReplaceData *m_FindReplaceData;
-    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();
+    // the last string we searched for
-
+    wxString m_lastSearch;
-    wxFindReplaceData      *m_FindReplaceData;
-    wxString                m_title;
-
-    wxFindReplaceDialogImpl *m_impl;
-
-    DECLARE_DYNAMIC_CLASS(wxFindReplaceDialog)
 };
 
+// include wxFindReplaceDialog declaration
+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
+    #include "wx/msw/fdrepdlg.h"
+#else
+    #define wxGenericFindReplaceDialog wxFindReplaceDialog
+    #define sm_classwxGenericFindReplaceDialog sm_classwxFindReplaceDialog
+
+    #include "wx/generic/fdrepdlg.h"
+#endif
+
 // ----------------------------------------------------------------------------
 // wxFindReplaceDialog events
 // ----------------------------------------------------------------------------

include/wx/generic/fdrepdlg.h

@@ -0,0 +1,71 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/msw/fdrepdlg.h
+// Purpose:     wxGenericFindReplaceDialog class
+// Author:      Markus Greither
+// Modified by:
+// Created:     25/05/2001
+// RCS-ID:
+// Copyright:   (c) wxWindows team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifdef __GNUG__
+    #pragma interface "genericfdrepdlg.h"
+#endif
+
+class WXDLLEXPORT wxCheckBox;
+class WXDLLEXPORT wxRadioBox;
+class WXDLLEXPORT wxTextCtrl;
+
+// ----------------------------------------------------------------------------
+// wxGenericFindReplaceDialog: dialog for searching / replacing text
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxGenericFindReplaceDialog : public wxFindReplaceDialogBase
+{
+public:
+    wxGenericFindReplaceDialog() { Init(); }
+
+    wxGenericFindReplaceDialog(wxWindow *parent,
+                               wxFindReplaceData *data,
+                               const wxString& title,
+                               int style = 0)
+    {
+        Init();
+
+        (void)Create(parent, data, title, style);
+    }
+
+    bool Create(wxWindow *parent,
+                wxFindReplaceData *data,
+                const wxString& title,
+                int style = 0);
+
+protected:
+    void Init();
+
+    void SendEvent(const wxEventType& evtType);
+
+    void OnFind(wxCommandEvent& event);
+    void OnReplace(wxCommandEvent& event);
+    void OnReplaceAll(wxCommandEvent& event);
+    void OnCancel(wxCommandEvent& event);
+
+    void OnUpdateFindUI(wxUpdateUIEvent& event);
+
+    void OnCloseWindow(wxCloseEvent& event);
+
+    wxCheckBox *m_chkCase,
+               *m_chkWord;
+
+    wxRadioBox *m_radioDir;
+
+    wxTextCtrl *m_textFind,
+               *m_textRepl;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxGenericFindReplaceDialog)
+
+    DECLARE_EVENT_TABLE()
+};
+

include/wx/gtk/dialog.h

@@ -68,7 +68,7 @@ public:
 
     bool Destroy();
 
-    virtual bool Show( bool show );
+    virtual bool Show( bool show = TRUE );
     virtual int ShowModal();
     virtual void EndModal( int retCode );
     virtual bool IsModal() const;

include/wx/gtk1/dialog.h

@@ -68,7 +68,7 @@ public:
 
     bool Destroy();
 
-    virtual bool Show( bool show );
+    virtual bool Show( bool show = TRUE );
     virtual int ShowModal();
     virtual void EndModal( int retCode );
     virtual bool IsModal() const;

include/wx/msw/fdrepdlg.h

@@ -0,0 +1,62 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/msw/fdrepdlg.h
+// Purpose:     wxFindReplaceDialog class
+// Author:      Markus Greither
+// Modified by: 31.07.01: VZ: integrated into wxWindows
+// Created:     23/03/2001
+// RCS-ID:
+// Copyright:   (c) Markus Greither
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifdef __GNUG__
+    #pragma interface "mswfdrepdlg.h"
+#endif
+
+// ----------------------------------------------------------------------------
+// wxFindReplaceDialog: dialog for searching / replacing text
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxFindReplaceDialog : public wxFindReplaceDialogBase
+{
+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);
+
+    virtual ~wxFindReplaceDialog();
+
+    // 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;
+
+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();
+
+    wxString                m_title;
+
+    wxFindReplaceDialogImpl *m_impl;
+
+    DECLARE_DYNAMIC_CLASS(wxFindReplaceDialog)
+};
+
+

setup.h.in

@@ -222,6 +222,11 @@
  */
 #define wxUSE_FILEDLG 0
 
+/*
+ * Use wxFindReplaceDialog
+ */
+#define wxUSE_FINDREPLDLG 0
+
 /*
  * Use wxFontDialog
  */
@@ -1009,7 +1014,4 @@
 /* Define this if you are using gtk and gdk contains support for X11R6 XIM */
 #undef HAVE_XIM
 
-/* now check the settings self consistency */
-#include "wx/chkconf.h"
-
 #endif /* __WX_SETUP_H__ */

src/common/fddlgcmn.cpp

@@ -0,0 +1,104 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/fdrepdlg.cpp
+// Purpose:     common parts of wxFindReplaceDialog implementations
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     01.08.01
+// RCS-ID:
+// Copyright:   (c) 2001 Vadim Zeitlin
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#ifdef __GNUG__
+    #pragma implementation "fdrepdlg.h"
+#endif
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_FINDREPLDLG
+
+#ifndef WX_PRECOMP
+#endif
+
+#include "wx/fdrepdlg.h"
+
+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxFindDialogEvent, wxCommandEvent)
+
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_FIND)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_FIND_NEXT)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_FIND_REPLACE)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_FIND_REPLACE_ALL)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_FIND_CLOSE)
+
+// ============================================================================
+// implementations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxFindReplaceData
+// ----------------------------------------------------------------------------
+
+void wxFindReplaceData::Init()
+{
+    m_Flags = 0;
+}
+
+// ----------------------------------------------------------------------------
+// wxFindReplaceDialogBase
+// ----------------------------------------------------------------------------
+
+wxFindReplaceDialogBase::~wxFindReplaceDialogBase()
+{
+}
+
+void wxFindReplaceDialogBase::Send(wxFindDialogEvent& event)
+{
+    // we copy the data to dialog->GetData() as well
+
+    m_FindReplaceData->m_Flags = event.GetFlags();
+    m_FindReplaceData->m_FindWhat = event.GetFindString();
+    if ( HasFlag(wxFR_REPLACEDIALOG) )
+    {
+        m_FindReplaceData->m_ReplaceWith = event.GetReplaceString();
+    }
+
+    // translate wxEVT_COMMAND_FIND_NEXT to wxEVT_COMMAND_FIND if needed
+    if ( event.GetEventType() == wxEVT_COMMAND_FIND_NEXT )
+    {
+        if ( m_FindReplaceData->m_FindWhat != m_lastSearch )
+        {
+            event.SetEventType(wxEVT_COMMAND_FIND);
+
+            m_lastSearch = m_FindReplaceData->m_FindWhat;
+        }
+    }
+
+    if ( !GetEventHandler()->ProcessEvent(event) )
+    {
+        // the event is not propagated upwards to the parent automatically
+        // because the dialog is a top level window, so do it manually as
+        // in 9 cases of 10 the message must be processed by the dialog
+        // owner and not the dialog itself
+        (void)GetParent()->GetEventHandler()->ProcessEvent(event);
+    }
+}
+
+#endif // wxUSE_FINDREPLDLG
+

src/files.lst

@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 20:55, 2001/07/13
+# This file was automatically generated by tmake at 16:03, 2001/08/01
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BASE.T!
 ALL_SOURCES = \
 		common/init.cpp \

src/generic/fdrepdlg.cpp

@@ -0,0 +1,288 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/generic/fdrepgg.cpp
+// Purpose:     Find/Replace dialogs
+// Author:      Markus Greither and Vadim Zeitlin
+// Modified by:
+// Created:     05/25/01
+// RCS-ID:
+// Copyright:   (c) wxWindows team
+// Licence:     wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+#ifdef __GNUG__
+    #pragma implementation "genericfdrepdlg.h"
+#endif
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_FINDREPLDLG
+
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+
+    #include "wx/sizer.h"
+
+    #include "wx/button.h"
+    #include "wx/checkbox.h"
+    #include "wx/radiobox.h"
+    #include "wx/stattext.h"
+    #include "wx/textctrl.h"
+#endif
+
+#include "wx/fdrepdlg.h"
+
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+enum
+{
+    wxID_REPLACE = 5890,
+    wxID_REPLACE_ALL
+};
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+IMPLEMENT_DYNAMIC_CLASS(wxGenericFindReplaceDialog, wxDialog)
+
+BEGIN_EVENT_TABLE(wxGenericFindReplaceDialog, wxDialog)
+    EVT_BUTTON(wxID_FIND, wxGenericFindReplaceDialog::OnFind)
+    EVT_BUTTON(wxID_REPLACE, wxGenericFindReplaceDialog::OnReplace)
+    EVT_BUTTON(wxID_REPLACE_ALL, wxGenericFindReplaceDialog::OnReplaceAll)
+    EVT_BUTTON(wxID_CANCEL, wxGenericFindReplaceDialog::OnCancel)
+
+    EVT_UPDATE_UI(wxID_FIND, wxGenericFindReplaceDialog::OnUpdateFindUI)
+    EVT_UPDATE_UI(wxID_REPLACE, wxGenericFindReplaceDialog::OnUpdateFindUI)
+    EVT_UPDATE_UI(wxID_REPLACE_ALL, wxGenericFindReplaceDialog::OnUpdateFindUI)
+
+    EVT_CLOSE(wxGenericFindReplaceDialog::OnCloseWindow)
+END_EVENT_TABLE()
+
+// ----------------------------------------------------------------------------
+// wxGenericFindReplaceDialog
+// ----------------------------------------------------------------------------
+
+void wxGenericFindReplaceDialog::Init()
+{
+    m_FindReplaceData = NULL;
+
+    m_chkWord =
+    m_chkCase = NULL;
+
+    m_radioDir = NULL;
+
+    m_textFind =
+    m_textRepl = NULL;
+}
+
+bool wxGenericFindReplaceDialog::Create(wxWindow *parent,
+                                        wxFindReplaceData *data,
+                                        const wxString& title,
+                                        int style)
+{
+    if ( !wxDialog::Create(parent, -1, title,
+                           wxDefaultPosition, wxDefaultSize,
+                           wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | style) )
+    {
+        return FALSE;
+    }
+
+    SetData(data);
+
+    wxCHECK_MSG( m_FindReplaceData, FALSE,
+                 _T("can't create dialog without data") );
+
+    wxBoxSizer *leftsizer = new wxBoxSizer( wxVERTICAL );
+
+    // 3 columns because there is a spacer in the middle
+    wxFlexGridSizer *sizer2Col = new wxFlexGridSizer(3);
+    sizer2Col->AddGrowableCol(2);
+
+    sizer2Col->Add(new wxStaticText(this, -1, _("Search for:"),
+                                    wxDefaultPosition, wxSize(80, -1)),
+                                    0,
+                                    wxALIGN_CENTRE_VERTICAL | wxALIGN_RIGHT);
+
+    sizer2Col->Add(10, 0);
+
+    m_textFind = new wxTextCtrl(this, -1, m_FindReplaceData->GetFindString());
+    sizer2Col->Add(m_textFind, 1, wxALIGN_CENTRE_VERTICAL | wxEXPAND);
+
+    if ( style & wxFR_REPLACEDIALOG )
+    {
+        sizer2Col->Add(new wxStaticText(this, -1, _("Replace with:"),
+                                        wxDefaultPosition, wxSize(80, -1)),
+                                        0,
+                                        wxALIGN_CENTRE_VERTICAL |
+                                        wxALIGN_RIGHT | wxTOP, 5);
+
+        sizer2Col->Add(10, 0);
+
+        m_textRepl = new wxTextCtrl(this, -1,
+                                    m_FindReplaceData->GetReplaceString());
+        sizer2Col->Add(m_textRepl, 1,
+                       wxALIGN_CENTRE_VERTICAL | wxEXPAND | wxTOP, 5);
+    }
+
+    leftsizer->Add(sizer2Col, 0, wxEXPAND | wxALL, 5);
+
+    wxBoxSizer *optsizer = new wxBoxSizer( wxHORIZONTAL );
+
+    wxBoxSizer *chksizer = new wxBoxSizer( wxVERTICAL);
+
+    m_chkWord = new wxCheckBox(this, -1, _("Whole word"));
+    chksizer->Add(m_chkWord, 0, wxALL, 3);
+
+    m_chkCase = new wxCheckBox(this, -1, _("Match case"));
+    chksizer->Add(m_chkCase, 0, wxALL, 3);
+
+    optsizer->Add(chksizer, 0, wxALL, 10);
+
+    static const wxString searchDirections[] = {_("Up"), _("Down")};
+    m_radioDir = new wxRadioBox(this, -1, _("Search direction"),
+                                wxDefaultPosition, wxDefaultSize,
+                                WXSIZEOF(searchDirections), searchDirections);
+
+    optsizer->Add(m_radioDir, 0, wxALL, 10);
+
+    leftsizer->Add(optsizer);
+
+    wxBoxSizer *bttnsizer = new wxBoxSizer(wxVERTICAL);
+
+    bttnsizer->Add(new wxButton(this, wxID_FIND, _("&Find")), 0, wxALL, 3);
+
+    bttnsizer->Add(new wxButton(this, wxID_CANCEL, _("&Cancel")), 0, wxALL, 3);
+
+    if ( style & wxFR_REPLACEDIALOG )
+    {
+        bttnsizer->Add(new wxButton(this, wxID_REPLACE, _("&Replace")),
+                                    0, wxALL, 3);
+
+        bttnsizer->Add(new wxButton(this, wxID_REPLACE_ALL, _("Replace &all")),
+                                    0, wxALL, 3);
+    }
+
+    wxBoxSizer *topsizer = new wxBoxSizer( wxHORIZONTAL );
+
+    topsizer->Add(leftsizer, 1, wxALL, 5);
+    topsizer->Add(bttnsizer, 0, wxALL, 5);
+
+    int flags = m_FindReplaceData->GetFlags();
+
+    if ( flags & wxFR_MATCHCASE )
+        m_chkCase->SetValue(TRUE);
+
+    if ( flags & wxFR_WHOLEWORD )
+        m_chkWord->SetValue(TRUE);
+
+    m_radioDir->SetSelection( flags & wxFR_DOWN );
+
+    if ( style & wxFR_NOMATCHCASE )
+        m_chkCase->Enable(FALSE);
+
+    if ( style & wxFR_NOWHOLEWORD )
+        m_chkWord->Enable(FALSE);
+
+    if ( style & wxFR_NOUPDOWN)
+        m_radioDir->Enable(FALSE);
+
+    SetAutoLayout( TRUE );
+    SetSizer( topsizer );
+
+    topsizer->SetSizeHints( this );
+    topsizer->Fit( this );
+
+    Centre( wxBOTH );
+
+    m_textFind->SetFocus();
+
+    return TRUE;
+}
+
+// ----------------------------------------------------------------------------
+// send the notification event
+// ----------------------------------------------------------------------------
+
+void wxGenericFindReplaceDialog::SendEvent(const wxEventType& evtType)
+{
+    wxFindDialogEvent event(evtType, GetId());
+    event.SetEventObject(this);
+    event.SetFindString(m_textFind->GetValue());
+    if ( HasFlag(wxFR_REPLACEDIALOG) )
+    {
+        event.SetReplaceString(m_textRepl->GetValue());
+    }
+
+    int flags = 0;
+
+    if ( m_chkCase->GetValue() )
+        flags |= wxFR_MATCHCASE;
+
+    if ( m_chkWord->GetValue() )
+        flags |= wxFR_WHOLEWORD;
+
+    if ( !m_radioDir || m_radioDir->GetSelection() == 1 )
+    {
+        flags |= wxFR_DOWN;
+    }
+
+    event.SetFlags(flags);
+
+    wxFindReplaceDialogBase::Send(event);
+}
+
+// ----------------------------------------------------------------------------
+// event handlers
+// ----------------------------------------------------------------------------
+
+void wxGenericFindReplaceDialog::OnFind(wxCommandEvent& event)
+{
+    SendEvent(wxEVT_COMMAND_FIND_NEXT);
+}
+
+void wxGenericFindReplaceDialog::OnReplace(wxCommandEvent& event)
+{
+    SendEvent(wxEVT_COMMAND_FIND_REPLACE);
+}
+
+void wxGenericFindReplaceDialog::OnReplaceAll(wxCommandEvent& event)
+{
+    SendEvent(wxEVT_COMMAND_FIND_REPLACE_ALL);
+}
+
+void wxGenericFindReplaceDialog::OnCancel(wxCommandEvent& event)
+{
+    SendEvent(wxEVT_COMMAND_FIND_CLOSE);
+
+    Show(FALSE);
+}
+
+void wxGenericFindReplaceDialog::OnUpdateFindUI(wxUpdateUIEvent &event)
+{
+    // we can't search for empty strings
+    event.Enable( !m_textFind->GetValue().empty() );
+}
+
+void wxGenericFindReplaceDialog::OnCloseWindow(wxCloseEvent &)
+{
+    SendEvent(wxEVT_COMMAND_FIND_CLOSE);
+}
+
+#endif // wxUSE_FINDREPLDLG
+

src/gtk/files.lst

@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 22:53, 2001/07/13
+# This file was automatically generated by tmake at 16:03, 2001/08/01
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
 ALL_SOURCES = \
 		generic/accel.cpp \
@@ -11,6 +11,7 @@ ALL_SOURCES = \
 		generic/dirctrlg.cpp \
 		generic/dirdlgg.cpp \
 		generic/dragimgg.cpp \
+		generic/fdrepdlg.cpp \
 		generic/filedlgg.cpp \
 		generic/fontdlgg.cpp \
 		generic/grid.cpp \
@@ -75,6 +76,7 @@ ALL_SOURCES = \
 		common/encconv.cpp \
 		common/event.cpp \
 		common/extended.c \
+		common/fddlgcmn.cpp \
 		common/ffile.cpp \
 		common/file.cpp \
 		common/fileconf.cpp \
@@ -272,7 +274,6 @@ ALL_HEADERS = \
 		choice.h \
 		clipbrd.h \
 		cmdline.h \
-		cmdproc.cpp \
 		cmndata.h \
 		colordlg.h \
 		colour.h \
@@ -314,6 +315,7 @@ ALL_HEADERS = \
 		encconv.h \
 		event.h \
 		expr.h \
+		fdrepdlg.h \
 		ffile.h \
 		file.h \
 		fileconf.h \
@@ -338,12 +340,10 @@ ALL_HEADERS = \
 		gifdecod.h \
 		glcanvas.h \
 		grid.h \
-		gridctrl.h \
 		gsocket.h \
 		hash.h \
 		help.h \
 		helpbase.h \
-		helpchm.h \
 		helphtml.h \
 		helpwin.h \
 		icon.h \
@@ -548,6 +548,7 @@ ALL_HEADERS = \
 		generic/dirctrlg.h \
 		generic/dirdlgg.h \
 		generic/dragimgg.h \
+		generic/fdrepdlg.h \
 		generic/filedlgg.h \
 		generic/fontdlgg.h \
 		generic/grid.h \
@@ -627,6 +628,7 @@ COMMONOBJS = \
 		encconv.o \
 		event.o \
 		extended.o \
+		fddlgcmn.o \
 		ffile.o \
 		file.o \
 		fileconf.o \
@@ -745,6 +747,7 @@ COMMONDEPS = \
 		encconv.d \
 		event.d \
 		extended.d \
+		fddlgcmn.d \
 		ffile.d \
 		file.d \
 		fileconf.d \
@@ -844,6 +847,7 @@ GENERICOBJS = \
 		dirctrlg.o \
 		dirdlgg.o \
 		dragimgg.o \
+		fdrepdlg.o \
 		filedlgg.o \
 		fontdlgg.o \
 		grid.o \
@@ -892,6 +896,7 @@ GENERICDEPS = \
 		dirctrlg.d \
 		dirdlgg.d \
 		dragimgg.d \
+		fdrepdlg.d \
 		filedlgg.d \
 		fontdlgg.d \
 		grid.d \

src/gtk1/files.lst

@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 22:53, 2001/07/13
+# This file was automatically generated by tmake at 16:03, 2001/08/01
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
 ALL_SOURCES = \
 		generic/accel.cpp \
@@ -11,6 +11,7 @@ ALL_SOURCES = \
 		generic/dirctrlg.cpp \
 		generic/dirdlgg.cpp \
 		generic/dragimgg.cpp \
+		generic/fdrepdlg.cpp \
 		generic/filedlgg.cpp \
 		generic/fontdlgg.cpp \
 		generic/grid.cpp \
@@ -75,6 +76,7 @@ ALL_SOURCES = \
 		common/encconv.cpp \
 		common/event.cpp \
 		common/extended.c \
+		common/fddlgcmn.cpp \
 		common/ffile.cpp \
 		common/file.cpp \
 		common/fileconf.cpp \
@@ -272,7 +274,6 @@ ALL_HEADERS = \
 		choice.h \
 		clipbrd.h \
 		cmdline.h \
-		cmdproc.cpp \
 		cmndata.h \
 		colordlg.h \
 		colour.h \
@@ -314,6 +315,7 @@ ALL_HEADERS = \
 		encconv.h \
 		event.h \
 		expr.h \
+		fdrepdlg.h \
 		ffile.h \
 		file.h \
 		fileconf.h \
@@ -338,12 +340,10 @@ ALL_HEADERS = \
 		gifdecod.h \
 		glcanvas.h \
 		grid.h \
-		gridctrl.h \
 		gsocket.h \
 		hash.h \
 		help.h \
 		helpbase.h \
-		helpchm.h \
 		helphtml.h \
 		helpwin.h \
 		icon.h \
@@ -548,6 +548,7 @@ ALL_HEADERS = \
 		generic/dirctrlg.h \
 		generic/dirdlgg.h \
 		generic/dragimgg.h \
+		generic/fdrepdlg.h \
 		generic/filedlgg.h \
 		generic/fontdlgg.h \
 		generic/grid.h \
@@ -627,6 +628,7 @@ COMMONOBJS = \
 		encconv.o \
 		event.o \
 		extended.o \
+		fddlgcmn.o \
 		ffile.o \
 		file.o \
 		fileconf.o \
@@ -745,6 +747,7 @@ COMMONDEPS = \
 		encconv.d \
 		event.d \
 		extended.d \
+		fddlgcmn.d \
 		ffile.d \
 		file.d \
 		fileconf.d \
@@ -844,6 +847,7 @@ GENERICOBJS = \
 		dirctrlg.o \
 		dirdlgg.o \
 		dragimgg.o \
+		fdrepdlg.o \
 		filedlgg.o \
 		fontdlgg.o \
 		grid.o \
@@ -892,6 +896,7 @@ GENERICDEPS = \
 		dirctrlg.d \
 		dirdlgg.d \
 		dragimgg.d \
+		fdrepdlg.d \
 		filedlgg.d \
 		fontdlgg.d \
 		grid.d \

src/motif/files.lst

@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 20:55, 2001/07/13
+# This file was automatically generated by tmake at 16:03, 2001/08/01
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MOTIF.T!
 ALL_SOURCES = \
 		generic/busyinfo.cpp \
@@ -10,6 +10,7 @@ ALL_SOURCES = \
 		generic/dirctrlg.cpp \
 		generic/dirdlgg.cpp \
 		generic/dragimgg.cpp \
+		generic/fdrepdlg.cpp \
 		generic/fontdlgg.cpp \
 		generic/grid.cpp \
 		generic/gridctrl.cpp \
@@ -74,6 +75,7 @@ ALL_SOURCES = \
 		common/encconv.cpp \
 		common/event.cpp \
 		common/extended.c \
+		common/fddlgcmn.cpp \
 		common/ffile.cpp \
 		common/file.cpp \
 		common/fileconf.cpp \
@@ -263,7 +265,6 @@ ALL_HEADERS = \
 		choice.h \
 		clipbrd.h \
 		cmdline.h \
-		cmdproc.cpp \
 		cmndata.h \
 		colordlg.h \
 		colour.h \
@@ -305,6 +306,7 @@ ALL_HEADERS = \
 		encconv.h \
 		event.h \
 		expr.h \
+		fdrepdlg.h \
 		ffile.h \
 		file.h \
 		fileconf.h \
@@ -329,12 +331,10 @@ ALL_HEADERS = \
 		gifdecod.h \
 		glcanvas.h \
 		grid.h \
-		gridctrl.h \
 		gsocket.h \
 		hash.h \
 		help.h \
 		helpbase.h \
-		helpchm.h \
 		helphtml.h \
 		helpwin.h \
 		icon.h \
@@ -537,6 +537,7 @@ ALL_HEADERS = \
 		generic/dirctrlg.h \
 		generic/dirdlgg.h \
 		generic/dragimgg.h \
+		generic/fdrepdlg.h \
 		generic/filedlgg.h \
 		generic/fontdlgg.h \
 		generic/grid.h \
@@ -616,6 +617,7 @@ COMMONOBJS = \
 		encconv.o \
 		event.o \
 		extended.o \
+		fddlgcmn.o \
 		ffile.o \
 		file.o \
 		fileconf.o \
@@ -734,6 +736,7 @@ COMMONDEPS = \
 		encconv.d \
 		event.d \
 		extended.d \
+		fddlgcmn.d \
 		ffile.d \
 		file.d \
 		fileconf.d \
@@ -832,6 +835,7 @@ GENERICOBJS = \
 		dirctrlg.o \
 		dirdlgg.o \
 		dragimgg.o \
+		fdrepdlg.o \
 		fontdlgg.o \
 		grid.o \
 		gridctrl.o \
@@ -879,6 +883,7 @@ GENERICDEPS = \
 		dirctrlg.d \
 		dirdlgg.d \
 		dragimgg.d \
+		fdrepdlg.d \
 		fontdlgg.d \
 		grid.d \
 		gridctrl.d \

src/msw/fdrepdlg.cpp

@@ -1,8 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/msw/fdrepdlg.cpp
 // Purpose:     wxFindReplaceDialog class
-// Author:      Markus Greither
+// Author:      Markus Greither and Vadim Zeitlin
-// Modified by: 31.07.01: VZ: integrated into wxWindows
+// Modified by:
 // Created:     23/03/2001
 // RCS-ID:
 // Copyright:   (c) Markus Greither
@@ -18,7 +18,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation "fdrepdlg.h"
+    #pragma implementation "mswfdrepdlg.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
@@ -61,14 +61,6 @@ UINT CALLBACK wxFindReplaceDialogHookProc(HWND hwnd,
 
 IMPLEMENT_DYNAMIC_CLASS(wxFindReplaceDialog, wxDialog)
 
-IMPLEMENT_DYNAMIC_CLASS(wxFindDialogEvent, wxCommandEvent)
-
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_FIND)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_FIND_NEXT)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_FIND_REPLACE)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_FIND_REPLACE_ALL)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_FIND_CLOSE)
-
 // ----------------------------------------------------------------------------
 // wxFindReplaceDialogImpl: the internals of wxFindReplaceDialog
 // ----------------------------------------------------------------------------
@@ -281,16 +273,7 @@ LRESULT APIENTRY wxFindReplaceWindowProc(HWND hwnd, WXUINT nMsg,
             event.SetReplaceString(pFR->lpstrReplaceWith);
         }
 
-        // TODO: should we copy the strings to dialog->GetData() as well?
+        dialog->Send(event);
-
-        if ( !dialog->GetEventHandler()->ProcessEvent(event) )
-        {
-            // the event is not propagated upwards to the parent automatically
-            // because the dialog is a top level window, so do it manually as
-            // in 9 cases of 10 the message must be processed by the dialog
-            // owner and not the dialog itself
-            (void)dialog->GetParent()->GetEventHandler()->ProcessEvent(event);
-        }
     }
 
     WNDPROC wndProc = (WNDPROC)::GetWindowLong(hwnd, GWL_USERDATA);
@@ -325,15 +308,6 @@ UINT CALLBACK wxFindReplaceDialogHookProc(HWND hwnd,
     return 0;
 }
 
-// ----------------------------------------------------------------------------
-// wxFindReplaceData
-// ----------------------------------------------------------------------------
-
-void wxFindReplaceData::Init()
-{
-    m_Flags = 0;
-}
-
 // ============================================================================
 // wxFindReplaceDialog implementation
 // ============================================================================

src/msw/files.lst

@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 20:55, 2001/07/13
+# This file was automatically generated by tmake at 16:03, 2001/08/01
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MSW.T!
 ALL_SOURCES = \
 		generic/busyinfo.cpp \
@@ -58,6 +58,7 @@ ALL_SOURCES = \
 		common/encconv.cpp \
 		common/event.cpp \
 		common/extended.c \
+		common/fddlgcmn.cpp \
 		common/ffile.cpp \
 		common/file.cpp \
 		common/fileconf.cpp \
@@ -105,6 +106,7 @@ ALL_SOURCES = \
 		common/object.cpp \
 		common/objstrm.cpp \
 		common/paper.cpp \
+		common/popupcmn.cpp \
 		common/prntbase.cpp \
 		common/process.cpp \
 		common/protocol.cpp \
@@ -181,6 +183,7 @@ ALL_SOURCES = \
 		msw/ole/droptgt.cpp \
 		msw/enhmeta.cpp \
 		msw/evtloop.cpp \
+		msw/fdrepdlg.cpp \
 		msw/filedlg.cpp \
 		msw/font.cpp \
 		msw/fontdlg.cpp \
@@ -287,7 +290,6 @@ ALL_HEADERS = \
 		choice.h \
 		clipbrd.h \
 		cmdline.h \
-		cmdproc.cpp \
 		cmndata.h \
 		colordlg.h \
 		colour.h \
@@ -329,6 +331,7 @@ ALL_HEADERS = \
 		encconv.h \
 		event.h \
 		expr.h \
+		fdrepdlg.h \
 		ffile.h \
 		file.h \
 		fileconf.h \
@@ -353,12 +356,10 @@ ALL_HEADERS = \
 		gifdecod.h \
 		glcanvas.h \
 		grid.h \
-		gridctrl.h \
 		gsocket.h \
 		hash.h \
 		help.h \
 		helpbase.h \
-		helpchm.h \
 		helphtml.h \
 		helpwin.h \
 		icon.h \
@@ -522,6 +523,7 @@ ALL_HEADERS = \
 		msw/dirdlg.h \
 		msw/dragimag.h \
 		msw/enhmeta.h \
+		msw/fdrepdlg.h \
 		msw/filedlg.h \
 		msw/font.h \
 		msw/fontdlg.h \
@@ -592,6 +594,7 @@ ALL_HEADERS = \
 		generic/dirctrlg.h \
 		generic/dirdlgg.h \
 		generic/dragimgg.h \
+		generic/fdrepdlg.h \
 		generic/filedlgg.h \
 		generic/fontdlgg.h \
 		generic/grid.h \
@@ -671,6 +674,7 @@ COMMONOBJS = \
 		encconv.o \
 		event.o \
 		extended.o \
+		fddlgcmn.o \
 		ffile.o \
 		file.o \
 		fileconf.o \
@@ -718,6 +722,7 @@ COMMONOBJS = \
 		object.o \
 		objstrm.o \
 		paper.o \
+		popupcmn.o \
 		prntbase.o \
 		process.o \
 		protocol.o \
@@ -788,6 +793,7 @@ COMMONDEPS = \
 		encconv.d \
 		event.d \
 		extended.d \
+		fddlgcmn.d \
 		ffile.d \
 		file.d \
 		fileconf.d \
@@ -835,6 +841,7 @@ COMMONDEPS = \
 		object.d \
 		objstrm.d \
 		paper.d \
+		popupcmn.d \
 		prntbase.d \
 		process.d \
 		protocol.d \
@@ -971,6 +978,7 @@ GUIOBJS = \
 		dragimag.o \
 		enhmeta.o \
 		evtloop.o \
+		fdrepdlg.o \
 		filedlg.o \
 		font.o \
 		fontdlg.o \
@@ -1070,6 +1078,7 @@ GUIDEPS = \
 		dragimag.d \
 		enhmeta.d \
 		evtloop.d \
+		fdrepdlg.d \
 		filedlg.d \
 		font.d \
 		fontdlg.d \

src/msw/makefile.b32

@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 20:55, 2001/07/13
+# This file was automatically generated by tmake at 16:03, 2001/08/01
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!
 
 #
@@ -142,6 +142,7 @@ COMMONOBJS = \
 		$(MSWDIR)\encconv.obj \
 		$(MSWDIR)\event.obj \
 		$(MSWDIR)\extended.obj \
+		$(MSWDIR)\fddlgcmn.obj \
 		$(MSWDIR)\ffile.obj \
 		$(MSWDIR)\file.obj \
 		$(MSWDIR)\fileconf.obj \
@@ -268,6 +269,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
 		$(MSWDIR)\droptgt.obj \
 		$(MSWDIR)\enhmeta.obj \
 		$(MSWDIR)\evtloop.obj \
+		$(MSWDIR)\fdrepdlg.obj \
 		$(MSWDIR)\filedlg.obj \
 		$(MSWDIR)\font.obj \
 		$(MSWDIR)\fontdlg.obj \
@@ -481,6 +483,8 @@ $(MSWDIR)\enhmeta.obj: $(MSWDIR)\enhmeta.$(SRCSUFF)
 
 $(MSWDIR)\evtloop.obj: $(MSWDIR)\evtloop.$(SRCSUFF)
 
+$(MSWDIR)\fdrepdlg.obj: $(MSWDIR)\fdrepdlg.$(SRCSUFF)
+
 $(MSWDIR)\filedlg.obj: $(MSWDIR)\filedlg.$(SRCSUFF)
 
 $(MSWDIR)\font.obj: $(MSWDIR)\font.$(SRCSUFF)
@@ -674,6 +678,8 @@ $(MSWDIR)\event.obj: $(COMMDIR)\event.$(SRCSUFF)
 
 $(MSWDIR)\extended.obj: $(COMMDIR)\extended.c
 
+$(MSWDIR)\fddlgcmn.obj: $(COMMDIR)\fddlgcmn.$(SRCSUFF)
+
 $(MSWDIR)\ffile.obj: $(COMMDIR)\ffile.$(SRCSUFF)
 
 $(MSWDIR)\file.obj: $(COMMDIR)\file.$(SRCSUFF)

src/msw/makefile.bcc

@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 20:55, 2001/07/13
+# This file was automatically generated by tmake at 16:03, 2001/08/01
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T!
 
 #
@@ -129,6 +129,7 @@ COMMONOBJS = \
 		$(MSWDIR)\encconv.obj \
 		$(MSWDIR)\event.obj \
 		$(MSWDIR)\extended.obj \
+		$(MSWDIR)\fddlgcmn.obj \
 		$(MSWDIR)\ffile.obj \
 		$(MSWDIR)\file.obj \
 		$(MSWDIR)\fileconf.obj \
@@ -542,6 +543,8 @@ $(MSWDIR)\event.obj: $(COMMDIR)\event.$(SRCSUFF)
 
 $(MSWDIR)\extended.obj: $(COMMDIR)\extended.c
 
+$(MSWDIR)\fddlgcmn.obj: $(COMMDIR)\fddlgcmn.$(SRCSUFF)
+
 $(MSWDIR)\ffile.obj: $(COMMDIR)\ffile.$(SRCSUFF)
 
 $(MSWDIR)\file.obj: $(COMMDIR)\file.$(SRCSUFF)

src/msw/makefile.dos

@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 20:55, 2001/07/13
+# This file was automatically generated by tmake at 16:03, 2001/08/01
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T!
 
 #
@@ -113,6 +113,7 @@ COMMONOBJS1 = \
 		$(COMMDIR)\encconv.obj \
 		$(COMMDIR)\event.obj \
 		$(COMMDIR)\extended.obj \
+		$(COMMDIR)\fddlgcmn.obj \
 		$(COMMDIR)\ffile.obj \
 		$(COMMDIR)\file.obj \
 		$(COMMDIR)\fileconf.obj \
@@ -891,6 +892,11 @@ $(COMMDIR)/extended.obj:     $*.c
 $(CPPFLAGS2) /Fo$@ /c /Tc $*.c
 <<
 
+$(COMMDIR)/fddlgcmn.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/ffile.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)

src/msw/makefile.g95

@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 20:55, 2001/07/13
+# This file was automatically generated by tmake at 16:03, 2001/08/01
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
 
 #
@@ -127,6 +127,7 @@ COMMONOBJS  = \
 		$(COMMDIR)/encconv.$(OBJSUFF) \
 		$(COMMDIR)/event.$(OBJSUFF) \
 		$(COMMDIR)/extended.$(OBJSUFF) \
+		$(COMMDIR)/fddlgcmn.$(OBJSUFF) \
 		$(COMMDIR)/ffile.$(OBJSUFF) \
 		$(COMMDIR)/file.$(OBJSUFF) \
 		$(COMMDIR)/fileconf.$(OBJSUFF) \
@@ -270,6 +271,7 @@ MSWOBJS     = \
 		$(MSWDIR)/dragimag.$(OBJSUFF) \
 		$(MSWDIR)/enhmeta.$(OBJSUFF) \
 		$(MSWDIR)/evtloop.$(OBJSUFF) \
+		$(MSWDIR)/fdrepdlg.$(OBJSUFF) \
 		$(MSWDIR)/filedlg.$(OBJSUFF) \
 		$(MSWDIR)/font.$(OBJSUFF) \
 		$(MSWDIR)/fontdlg.$(OBJSUFF) \

src/msw/makefile.sc

@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 20:55, 2001/07/13
+# This file was automatically generated by tmake at 16:03, 2001/08/01
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T!
 
 # Symantec C++ makefile for the msw objects
@@ -85,6 +85,7 @@ COMMONOBJS = \
 		$(COMMDIR)\encconv.obj \
 		$(COMMDIR)\event.obj \
 		$(COMMDIR)\extended.obj \
+		$(COMMDIR)\fddlgcmn.obj \
 		$(COMMDIR)\ffile.obj \
 		$(COMMDIR)\file.obj \
 		$(COMMDIR)\fileconf.obj \
@@ -211,6 +212,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
 		$(MSWDIR)\ole\droptgt.obj \
 		$(MSWDIR)\enhmeta.obj \
 		$(MSWDIR)\evtloop.obj \
+		$(MSWDIR)\fdrepdlg.obj \
 		$(MSWDIR)\filedlg.obj \
 		$(MSWDIR)\font.obj \
 		$(MSWDIR)\fontdlg.obj \

src/msw/makefile.vc

@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 17:17, 2001/07/16
+# This file was automatically generated by tmake at 16:03, 2001/08/01
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc
@@ -159,6 +159,7 @@ COMMONOBJS = \
 		$(COMMDIR)\$D\encconv.obj \
 		$(COMMDIR)\$D\event.obj \
 		$(COMMDIR)\$D\extended.obj \
+		$(COMMDIR)\$D\fddlgcmn.obj \
 		$(COMMDIR)\$D\ffile.obj \
 		$(COMMDIR)\$D\file.obj \
 		$(COMMDIR)\$D\fileconf.obj \
@@ -285,6 +286,7 @@ MSWOBJS = $(MSWDIR)\$D\accel.obj \
 		$(OLEDIR)\$D\droptgt.obj \
 		$(MSWDIR)\$D\enhmeta.obj \
 		$(MSWDIR)\$D\evtloop.obj \
+		$(MSWDIR)\$D\fdrepdlg.obj \
 		$(MSWDIR)\$D\filedlg.obj \
 		$(MSWDIR)\$D\font.obj \
 		$(MSWDIR)\$D\fontdlg.obj \

src/msw/makefile.wat

@@ -1,6 +1,6 @@
 #!/binb/wmake.exe
 
-# This file was automatically generated by tmake at 20:55, 2001/07/13
+# This file was automatically generated by tmake at 16:03, 2001/08/01
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
 
 #
@@ -78,6 +78,7 @@ NONESSENTIALOBJS= accel.obj &
 	colrdlgg.obj &
 	dcpsg.obj &
 	dirdlgg.obj &
+	fdrepdlg.obj &
 	filedlgg.obj &
 	fontdlgg.obj &
 	helpext.obj &
@@ -123,6 +124,7 @@ COMMONOBJS = &
 	encconv.obj &
 	event.obj &
 	extended.obj &
+	fddlgcmn.obj &
 	ffile.obj &
 	file.obj &
 	fileconf.obj &
@@ -249,6 +251,7 @@ MSWOBJS = accel.obj &
 	droptgt.obj &
 	enhmeta.obj &
 	evtloop.obj &
+	fdrepdlg.obj &
 	filedlg.obj &
 	font.obj &
 	fontdlg.obj &
@@ -477,6 +480,9 @@ enhmeta.obj:     $(MSWDIR)\enhmeta.cpp
 evtloop.obj:     $(MSWDIR)\evtloop.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+fdrepdlg.obj:     $(MSWDIR)\fdrepdlg.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 filedlg.obj:     $(MSWDIR)\filedlg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -776,6 +782,9 @@ event.obj:     $(COMMDIR)\event.cpp
 extended.obj:     $(COMMDIR)\extended.c
   *$(CC) $(CPPFLAGS) $(IFLAGS) $<
 
+fddlgcmn.obj:     $(COMMDIR)\fddlgcmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 ffile.obj:     $(COMMDIR)\ffile.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

src/univ/files.lst

@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 20:55, 2001/07/13
+# This file was automatically generated by tmake at 16:03, 2001/08/01
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
 UNIVOBJS = \
 		bmpbuttn.o \