Make storing non-trivial data in wxThreadSpecificInfo possible.

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

diff --git a/interface/wx/fdrepdlg.h b/interface/wx/fdrepdlg.h
index eb288225e82ba86e3cd145c3bcfca6e179a61040..eca36e5246cab394baae35690b960a93e088fe49 100644 (file)
--- a/interface/wx/fdrepdlg.h
+++ b/interface/wx/fdrepdlg.h
@@ -2,8 +2,7 @@
 // Name:        fdrepdlg.h
 // Purpose:     interface of wxFindDialogEvent, wxFindReplaceDialog
 // Author:      wxWidgets team
 // Name:        fdrepdlg.h
 // Purpose:     interface of wxFindDialogEvent, wxFindReplaceDialog
 // Author:      wxWidgets team

-// RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 


@@ -20,7 +19,7 @@ enum wxFindReplaceFlags
 
     /** case sensitive search/replace selected (otherwise - case insensitive) */
     wxFR_MATCHCASE  = 4
 
     /** case sensitive search/replace selected (otherwise - case insensitive) */
     wxFR_MATCHCASE  = 4

-}
+};

 
 
 /**
 
 
 /**


@@ -39,13 +38,13 @@ enum wxFindReplaceDialogStyles
 
     /** don't allow whole word searching */
     wxFR_NOWHOLEWORD   = 8
 
     /** don't allow whole word searching */
     wxFR_NOWHOLEWORD   = 8

-}
+};

 
 
 /**
     @class wxFindDialogEvent
 
 
 
 /**
     @class wxFindDialogEvent
 

-    wxFindReplaceDialog events
+    wxFindReplaceDialog events.

 
     @beginEventTable{wxFindDialogEvent}
     @event{EVT_FIND(id, func)}
 
     @beginEventTable{wxFindDialogEvent}
     @event{EVT_FIND(id, func)}


@@ -67,7 +66,7 @@ class wxFindDialogEvent : public wxCommandEvent
 {
 public:
     /**
 {
 public:
     /**

-        Constuctor used by wxWidgets only.
+        Constructor used by wxWidgets only.

     */
     wxFindDialogEvent(wxEventType commandType = wxEVT_NULL,
                       int id = 0);
     */
     wxFindDialogEvent(wxEventType commandType = wxEVT_NULL,
                       int id = 0);


@@ -95,6 +94,12 @@ public:
     const wxString& GetReplaceString() const;
 };
 
     const wxString& GetReplaceString() const;
 };
 

+wxEventType wxEVT_FIND;
+wxEventType wxEVT_FIND_NEXT;
+wxEventType wxEVT_FIND_REPLACE;
+wxEventType wxEVT_FIND_REPLACE_ALL;
+wxEventType wxEVT_FIND_CLOSE;
+

 
 
 /**
 
 
 /**


@@ -111,20 +116,20 @@ public:
     dialog and calling them has no effect later.
 
     @library{wxcore}
     dialog and calling them has no effect later.
 
     @library{wxcore}

-    @category{data}
+    @category{cmndlg,data}

 */
 class wxFindReplaceData : public wxObject
 {
 public:
     /**
 */
 class wxFindReplaceData : public wxObject
 {
 public:
     /**

-        Constuctor initializes the flags to default value (0).
+        Constructor initializes the flags to default value (0).

     */
     wxFindReplaceData(wxUint32 flags = 0);
 
     /**
         Get the string to find.
     */
     */
     wxFindReplaceData(wxUint32 flags = 0);
 
     /**
         Get the string to find.
     */

-    const wxString GetFindString();
+    const wxString& GetFindString() const;

 
     /**
         Get the combination of @c wxFindReplaceFlags values.
 
     /**
         Get the combination of @c wxFindReplaceFlags values.


@@ -134,7 +139,7 @@ public:
     /**
         Get the replacement string.
     */
     /**
         Get the replacement string.
     */

-    const wxString GetReplaceString();
+    const wxString& GetReplaceString() const;

 
     /**
         Set the string to find (used as initial value by the dialog).
 
     /**
         Set the string to find (used as initial value by the dialog).


@@ -189,7 +194,7 @@ public:
     /**
         Destructor.
     */
     /**
         Destructor.
     */

-    ~wxFindReplaceDialog();
+    virtual ~wxFindReplaceDialog();

 
     /**
         Creates the dialog; use wxWindow::Show to show it on screen.
 
     /**
         Creates the dialog; use wxWindow::Show to show it on screen.