Ticket #9592: gtk-choice-setcolumns.2.diff

[wxWidgets.git] / interface / textdlg.h

diff --git a/interface/textdlg.h b/interface/textdlg.h
index 107da9c5237d81be777de970fd832c3754c3f847..dc7245790d846aa9b40d049d6ec363b2b9c5d837 100644 (file)
--- a/interface/textdlg.h
+++ b/interface/textdlg.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        textdlg.h
 /////////////////////////////////////////////////////////////////////////////
 // Name:        textdlg.h

-// Purpose:     documentation for wxPasswordEntryDialog class
+// Purpose:     interface of wxPasswordEntryDialog

 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Licence:     wxWindows license
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Licence:     wxWindows license


@@ -17,8 +17,8 @@
     @library{wxbase}
     @category{cmndlg}
 
     @library{wxbase}
     @category{cmndlg}
 

-    @seealso
-    @ref overview_wxpasswordentrydialogoverview "wxPassowrdEntryDialog overview"
+    @see @ref overview_wxpasswordentrydialogoverview "wxPassowrdEntryDialog
+    overview"

 */
 class wxPasswordEntryDialog : public wxTextEntryDialog
 {
 */
 class wxPasswordEntryDialog : public wxTextEntryDialog
 {


@@ -27,6 +27,7 @@ public:
 };
 
 
 };
 
 

+

 /**
     @class wxTextEntryDialog
     @wxheader{textdlg.h}
 /**
     @class wxTextEntryDialog
     @wxheader{textdlg.h}


@@ -38,15 +39,14 @@ public:
     @library{wxbase}
     @category{cmndlg}
 
     @library{wxbase}
     @category{cmndlg}
 

-    @seealso
-    @ref overview_wxtextentrydialogoverview "wxTextEntryDialog overview"
+    @see @ref overview_wxtextentrydialogoverview "wxTextEntryDialog overview"

 */
 class wxTextEntryDialog : public wxDialog
 {
 public:
     /**
         Constructor. Use ShowModal() to show the dialog.
 */
 class wxTextEntryDialog : public wxDialog
 {
 public:
     /**
         Constructor. Use ShowModal() to show the dialog.

-        
+

         @param parent
             Parent window.
         @param message
         @param parent
             Parent window.
         @param message


@@ -76,7 +76,7 @@ public:
         original value
         if the user has pressed Cancel.
     */
         original value
         if the user has pressed Cancel.
     */

-    wxString GetValue();
+    wxString GetValue() const;

 
     /**
         Sets the default text value.
 
     /**
         Sets the default text value.


@@ -91,16 +91,23 @@ public:
 };
 
 
 };
 
 

+

 // ============================================================================
 // Global functions/macros
 // ============================================================================
 
 // ============================================================================
 // Global functions/macros
 // ============================================================================
 

+/** @ingroup group_funcmacro_dialog */
+//@{
+

 /**
 /**

-    Pop up a dialog box with title set to @e caption, @e message, and a
-    @e default_value.  The user may type in text and press OK to return this text,
-    or press Cancel to return the empty string.
-    If @a centre is @true, the message text (which may include new line characters)
-    is centred; if @false, the message is left-justified.
+    Pop up a dialog box with title set to @e caption, @c message, and a
+    @c default_value. The user may type in text and press OK to return this
+    text, or press Cancel to return the empty string.
+
+    If @c centre is @true, the message text (which may include new line
+    characters) is centred; if @false, the message is left-justified.
+
+    @header{wx/textdlg.h}

 */
 wxString wxGetTextFromUser(const wxString& message,
                            const wxString& caption = "Input text",
 */
 wxString wxGetTextFromUser(const wxString& message,
                            const wxString& caption = "Input text",


@@ -111,9 +118,11 @@ wxString wxGetTextFromUser(const wxString& message,
                            bool centre = true);
 
 /**
                            bool centre = true);
 
 /**

-    Similar to wxGetTextFromUser but the text entered
-    in the dialog is not shown on screen but replaced with stars. This is intended
-    to be used for entering passwords as the function name implies.
+    Similar to wxGetTextFromUser() but the text entered in the dialog is not
+    shown on screen but replaced with stars. This is intended to be used for
+    entering passwords as the function name implies.
+
+    @header{wx/textdlg.h}

 */
 wxString wxGetPasswordFromUser(const wxString& message,
                                const wxString& caption = "Input text",
 */
 wxString wxGetPasswordFromUser(const wxString& message,
                                const wxString& caption = "Input text",


@@ -123,3 +132,5 @@ wxString wxGetPasswordFromUser(const wxString& message,
                                int y = wxDefaultCoord,
                                bool centre = true);
 
                                int y = wxDefaultCoord,
                                bool centre = true);
 

+//@}
+