Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

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

diff --git a/interface/wx/textdlg.h b/interface/wx/textdlg.h
index 9147e419e4ee51f4a5c4535885be6fcced16c07a..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$
 // Purpose:     interface of wxPasswordEntryDialog
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /**
 /////////////////////////////////////////////////////////////////////////////
 
 /**


@@ -14,7 +14,7 @@
 
     It is implemented as a generic wxWidgets dialog.
 
 
     It is implemented as a generic wxWidgets dialog.
 

-    @library{wxbase}
+    @library{wxcore}

     @category{cmndlg}
 
     @see @ref overview_cmndlg_password
     @category{cmndlg}
 
     @see @ref overview_cmndlg_password


@@ -31,6 +31,8 @@ public:
             Parent window.
         @param message
             Message to show on the dialog.
             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
         @param defaultValue
             The default value, which may be the empty string.
         @param style


@@ -41,7 +43,7 @@ public:
             Dialog position.
     */
     wxPasswordEntryDialog(wxWindow* parent, const wxString& message,
             Dialog position.
     */
     wxPasswordEntryDialog(wxWindow* parent, const wxString& message,

-                          const wxString& caption = "Enter password",
+                          const wxString& caption = wxGetPasswordFromUserPromptStr,

                           const wxString& defaultValue = wxEmptyString,
                           long style = wxOK | wxCANCEL | wxCENTRE,
                           const wxPoint& pos = wxDefaultPosition);
                           const wxString& defaultValue = wxEmptyString,
                           long style = wxOK | wxCANCEL | wxCENTRE,
                           const wxPoint& pos = wxDefaultPosition);


@@ -55,7 +57,7 @@ public:
     This class represents a dialog that requests a one-line text string from the user.
     It is implemented as a generic wxWidgets dialog.
 
     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_cmndlg_textentry
     @category{cmndlg}
 
     @see @ref overview_cmndlg_textentry


@@ -70,18 +72,21 @@ public:
             Parent window.
         @param message
             Message to show on the dialog.
             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
             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.
+            (such as @c wxTE_PASSWORD or @c wxTE_MULTILINE) may be specified
+            here.

         @param pos
             Dialog position.
     */
     wxTextEntryDialog(wxWindow* parent, const wxString& message,
         @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);
 
                       long style = wxOK | wxCANCEL | wxCENTRE,
                       const wxPoint& pos = wxDefaultPosition);
 


@@ -114,7 +119,7 @@ public:
 // Global functions/macros
 // ============================================================================
 
 // Global functions/macros
 // ============================================================================
 

-/** @ingroup group_funcmacro_dialog */
+/** @addtogroup group_funcmacro_dialog */

 //@{
 
 /**
 //@{
 
 /**


@@ -125,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.
 
     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",
     @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,
                            wxWindow* parent = NULL,
                            int x = wxDefaultCoord,
                            int y = wxDefaultCoord,


@@ -144,7 +155,7 @@ wxString wxGetTextFromUser(const wxString& message,
 */
 wxString wxGetPasswordFromUser(const wxString& message,
                                const wxString& caption = "Input text",
 */
 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,
                                wxWindow* parent = NULL,
                                int x = wxDefaultCoord,
                                int y = wxDefaultCoord,