Fix scrolling to the bottom in wxTextCtrl::AppendText().

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

diff --git a/interface/wx/textdlg.h b/interface/wx/textdlg.h
index e61352fe241c1535b542c2db45cadd182f5bbb38..24c3b80bafe44451fcb83008d7c1874915e6637f 100644 (file)
--- a/interface/wx/textdlg.h
+++ b/interface/wx/textdlg.h
@@ -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


@@ -72,7 +74,7 @@ public:
             Message to show on the dialog.
         @param caption
             The caption of the the dialog.
             Message to show on the dialog.
         @param caption
             The caption of the the dialog.

-        @param defaultValue
+        @param value

             The default value, which may be the empty string.
         @param style
             A dialog style, specifying the buttons (wxOK, wxCANCEL)
             The default value, which may be the empty string.
         @param style
             A dialog style, specifying the buttons (wxOK, wxCANCEL)


@@ -82,8 +84,8 @@ public:
             Dialog position.
     */
     wxTextEntryDialog(wxWindow* parent, const wxString& message,
             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);
 


@@ -116,7 +118,7 @@ public:
 // Global functions/macros
 // ============================================================================
 
 // Global functions/macros
 // ============================================================================
 

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

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


@@ -131,7 +133,7 @@ public:
 */
 wxString wxGetTextFromUser(const wxString& message,
                            const wxString& caption = "Input text",
 */
 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,


@@ -146,7 +148,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,