No changes, just merge some strings in wxSVGFileDC.

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

diff --git a/interface/wx/textdlg.h b/interface/wx/textdlg.h
index e6bfb2d1f8e6c750e154b03d972f40738504eae3..a1ddf2e6ec95e48bbfe5fa71f98d237cbf5e05f0 100644 (file)
--- a/interface/wx/textdlg.h
+++ b/interface/wx/textdlg.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxPasswordEntryDialog
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 /**
@@ -11,18 +11,42 @@
 
     This class represents a dialog that requests a one-line password string from
     the user.
+
     It is implemented as a generic wxWidgets dialog.
 
-    @library{wxbase}
+    @library{wxcore}
     @category{cmndlg}
 
-    @see @ref overview_wxpasswordentrydialogoverview "wxPassowrdEntryDialog
-    overview"
+    @see @ref overview_cmndlg_password
 */
 class wxPasswordEntryDialog : public wxTextEntryDialog
 {
 public:
+    /**
+        Constructor.
 
+        Use wxTextEntryDialog::ShowModal to show the dialog.
+
+        @param parent
+            Parent window.
+        @param message
+            Message to show on the dialog.
+        @param caption
+            The caption of the dialog.
+        @param defaultValue
+            The default value, which may be the empty string.
+        @param style
+            A dialog style, specifying the buttons (wxOK, wxCANCEL) and an
+            optional wxCENTRE style. You do not need to specify the wxTE_PASSWORD style,
+            it is always applied.
+        @param pos
+            Dialog position.
+    */
+    wxPasswordEntryDialog(wxWindow* parent, const wxString& message,
+                          const wxString& caption = wxGetPasswordFromUserPromptStr,
+                          const wxString& defaultValue = wxEmptyString,
+                          long style = wxOK | wxCANCEL | wxCENTRE,
+                          const wxPoint& pos = wxDefaultPosition);
 };
 
 
@@ -30,14 +54,13 @@ public:
 /**
     @class wxTextEntryDialog
 
-    This class represents a dialog that requests a one-line text string from the
-    user.
+    This class represents a dialog that requests a one-line text string from the user.
     It is implemented as a generic wxWidgets dialog.
 
-    @library{wxbase}
+    @library{wxcore}
     @category{cmndlg}
 
-    @see @ref overview_wxtextentrydialogoverview "wxTextEntryDialog overview"
+    @see @ref overview_cmndlg_textentry
 */
 class wxTextEntryDialog : public wxDialog
 {
@@ -49,30 +72,32 @@ public:
             Parent window.
         @param message
             Message to show on the dialog.
-        @param defaultValue
+        @param caption
+            The caption of the dialog.
+        @param value
             The default value, which may be the empty string.
         @param style
             A dialog style, specifying the buttons (wxOK, wxCANCEL)
-            and an optional wxCENTRE style. Additionally, wxTextCtrl styles (such as
-            wxTE_PASSWORD) may be specified here.
+            and an optional wxCENTRE style. Additionally, wxTextCtrl styles
+            (such as @c wxTE_PASSWORD or @c wxTE_MULTILINE) may be specified
+            here.
         @param pos
             Dialog position.
     */
     wxTextEntryDialog(wxWindow* parent, const wxString& message,
-                      const wxString& caption = "Please enter text",
-                      const wxString& defaultValue = "",
+                      const wxString& caption = wxGetTextFromUserPromptStr,
+                      const wxString& value = wxEmptyString,
                       long style = wxOK | wxCANCEL | wxCENTRE,
                       const wxPoint& pos = wxDefaultPosition);
 
     /**
         Destructor.
     */
-    ~wxTextEntryDialog();
+    virtual ~wxTextEntryDialog();
 
     /**
         Returns the text that the user has entered if the user has pressed OK, or the
-        original value
-        if the user has pressed Cancel.
+        original value if the user has pressed Cancel.
     */
     wxString GetValue() const;
 
@@ -94,7 +119,7 @@ public:
 // Global functions/macros
 // ============================================================================
 
-/** @ingroup group_funcmacro_dialog */
+/** @addtogroup group_funcmacro_dialog */
 //@{
 
 /**
@@ -105,11 +130,17 @@ public:
     If @c centre is @true, the message text (which may include new line
     characters) is centred; if @false, the message is left-justified.
 
+    This function is a wrapper around wxTextEntryDialog and while it is usually
+    more convenient to use, using the dialog directly is more flexible, e.g. it
+    allows you to specify the @c wxTE_MULTILINE to allow the user enter
+    multiple lines of text while this function is limited to single line entry
+    only.
+
     @header{wx/textdlg.h}
 */
 wxString wxGetTextFromUser(const wxString& message,
                            const wxString& caption = "Input text",
-                           const wxString& default_value = "",
+                           const wxString& default_value = wxEmptyString,
                            wxWindow* parent = NULL,
                            int x = wxDefaultCoord,
                            int y = wxDefaultCoord,
@@ -124,7 +155,7 @@ wxString wxGetTextFromUser(const wxString& message,
 */
 wxString wxGetPasswordFromUser(const wxString& message,
                                const wxString& caption = "Input text",
-                               const wxString& default_value = "",
+                               const wxString& default_value = wxEmptyString,
                                wxWindow* parent = NULL,
                                int x = wxDefaultCoord,
                                int y = wxDefaultCoord,