introduce a new @beginFlagTable

[wxWidgets.git] / interface / control.h

diff --git a/interface/control.h b/interface/control.h
index eb7699f1747e0cb2df3db3ba98641490a3e927ce..3d5b7ef17ade63e02e5dfa9c87703d0e161e8ebd 100644 (file)
--- a/interface/control.h
+++ b/interface/control.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        control.h
 /////////////////////////////////////////////////////////////////////////////
 // Name:        control.h

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

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


@@ -10,7 +10,7 @@
     @class wxControl
     @wxheader{control.h}
 
     @class wxControl
     @wxheader{control.h}
 

-    This is the base class for a control or "widget''.
+    This is the base class for a control or "widget".

 
     A control is generally a small window which processes user input and/or
     displays one or more item of data.
 
     A control is generally a small window which processes user input and/or
     displays one or more item of data.


@@ -19,8 +19,7 @@
     @category{ctrl}
     @appearance{control.png}
 
     @category{ctrl}
     @appearance{control.png}
 

-    @seealso
-    wxValidator
+    @see wxValidator

 */
 class wxControl : public wxWindow
 {
 */
 class wxControl : public wxWindow
 {


@@ -33,26 +32,24 @@ public:
 
     /**
         Returns the control's text.
 
     /**
         Returns the control's text.

-        

         Note that the returned string contains the mnemonics (@c  characters) if
         any, use GetLabelText() if they are
         undesired.
     */
         Note that the returned string contains the mnemonics (@c  characters) if
         any, use GetLabelText() if they are
         undesired.
     */

-    wxString GetLabel();
+    wxString GetLabel() const;

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

-        Returns the control's label, or the given @e label string for the static
+        Returns the control's label, or the given @a label string for the static

         version, without the mnemonics characters.
     */
     const wxString GetLabelText();
         version, without the mnemonics characters.
     */
     const wxString GetLabelText();

-    static wxString GetLabelText(const wxString& label);
+    const static wxString  GetLabelText(const wxString& label);

     //@}
 
     /**
         Sets the item's text.
     //@}
 
     /**
         Sets the item's text.

-        
-        The @c  characters in the @e label are special and indicate that the
+        The @c  characters in the @a label are special and indicate that the

         following character is a mnemonic for this control and can be used to activate
         it from the keyboard (typically by using @e Alt key in combination with
         it). To insert a literal ampersand character, you need to double it, i.e. use
         following character is a mnemonic for this control and can be used to activate
         it from the keyboard (typically by using @e Alt key in combination with
         it). To insert a literal ampersand character, you need to double it, i.e. use


@@ -60,3 +57,4 @@ public:
     */
     void SetLabel(const wxString& label);
 };
     */
     void SetLabel(const wxString& label);
 };

+