Make wxTopLevelWindow::GetDefaultSize() public and document it.

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

diff --git a/interface/wx/choice.h b/interface/wx/choice.h
index 82cb664da29542c7180657de866c0223a72b0433..0ba51c75467ffec018924cc5c340d5a5121bd009 100644 (file)
--- a/interface/wx/choice.h
+++ b/interface/wx/choice.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxChoice
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     interface of wxChoice
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

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

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


@@ -40,7 +40,6 @@ public:
     */
     wxChoice();
 
     */
     wxChoice();
 

-    //@{

     /**
         Constructor, creating and showing a choice.
 
     /**
         Constructor, creating and showing a choice.
 


@@ -50,9 +49,10 @@ public:
             Window identifier. The value wxID_ANY indicates a default value.
         @param pos
             Window position.
             Window identifier. The value wxID_ANY indicates a default value.
         @param pos
             Window position.

+            If ::wxDefaultPosition is specified then a default position is chosen.

         @param size
         @param size

-            Window size. If wxDefaultSize is specified then the choice is sized
-            appropriately.
+            Window size. 
+            If ::wxDefaultSize is specified then the choice is sized appropriately.

         @param n
             Number of strings with which to initialise the choice control.
         @param choices
         @param n
             Number of strings with which to initialise the choice control.
         @param choices


@@ -72,6 +72,10 @@ public:
         arguments to a single argument, which is a list of strings.
 
         @endWxPythonOnly
         arguments to a single argument, which is a list of strings.
 
         @endWxPythonOnly

+
+        @beginWxPerlOnly
+        Not supported by wxPerl.
+        @endWxPerlOnly

     */
     wxChoice( wxWindow *parent, wxWindowID id,
             const wxPoint& pos = wxDefaultPosition,
     */
     wxChoice( wxWindow *parent, wxWindowID id,
             const wxPoint& pos = wxDefaultPosition,


@@ -110,6 +114,10 @@ public:
         arguments to a single argument, which is a list of strings.
 
         @endWxPythonOnly
         arguments to a single argument, which is a list of strings.
 
         @endWxPythonOnly

+
+        @beginWxPerlOnly
+        Use an array reference for the @a choices parameter.
+        @endWxPerlOnly

     */
     wxChoice( wxWindow *parent, wxWindowID id,
             const wxPoint& pos,
     */
     wxChoice( wxWindow *parent, wxWindowID id,
             const wxPoint& pos,


@@ -118,7 +126,6 @@ public:
             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxChoiceNameStr );
             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxChoiceNameStr );

-    //@}

 
     /**
         Destructor, destroying the choice item.
 
     /**
         Destructor, destroying the choice item.