Removed wxPG_EX_LEGACY_VALIDATORS

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

diff --git a/interface/wx/choice.h b/interface/wx/choice.h
index acb6033101fc0f921565607b33d2754f0a0ed5c6..0ad3fdbef2cf1e69ce1a9643f3fcbcbffcc54941 100644 (file)
--- a/interface/wx/choice.h
+++ b/interface/wx/choice.h
@@ -8,7 +8,6 @@
 
 /**
     @class wxChoice
 
 /**
     @class wxChoice

-    @wxheader{choice.h}

 
     A choice item is used to select one of a list of strings. Unlike a
     wxListBox, only the selection is visible until the user pulls down the
 
     A choice item is used to select one of a list of strings. Unlike a
     wxListBox, only the selection is visible until the user pulls down the


@@ -81,6 +80,37 @@ public:
              long style = 0,
              const wxValidator& validator = wxDefaultValidator,
              const wxString& name = "choice");
              long style = 0,
              const wxValidator& validator = wxDefaultValidator,
              const wxString& name = "choice");

+
+    /**
+        Constructor, creating and showing a choice.
+
+        @param parent
+            Parent window. Must not be @NULL.
+        @param id
+            Window identifier. The value wxID_ANY indicates a default value.
+        @param pos
+            Window position.
+        @param size
+            Window size. If wxDefaultSize is specified then the choice is sized
+            appropriately.
+        @param choices
+            An array of strings with which to initialise the choice control.
+        @param style
+            Window style. See wxChoice.
+        @param validator
+            Window validator.
+        @param name
+            Window name.
+
+        @see Create(), wxValidator
+
+        @beginWxPythonOnly
+
+        The wxChoice constructor in wxPython reduces the @a n and @a choices
+        arguments to a single argument, which is a list of strings.
+
+        @endWxPythonOnly
+    */

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


@@ -93,7 +123,7 @@ public:
     /**
         Destructor, destroying the choice item.
     */
     /**
         Destructor, destroying the choice item.
     */

-    ~wxChoice();
+    virtual ~wxChoice();

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


@@ -120,7 +150,7 @@ public:
         @remarks This is implemented for GTK and Motif only and always 
                  returns 1 for the other platforms.
     */
         @remarks This is implemented for GTK and Motif only and always 
                  returns 1 for the other platforms.
     */

-    int GetColumns() const;
+    virtual int GetColumns() const;

 
     /**
         Unlike wxControlWithItems::GetSelection() which only returns the
 
     /**
         Unlike wxControlWithItems::GetSelection() which only returns the


@@ -134,7 +164,7 @@ public:
                In older versions, wxControlWithItems::GetSelection() itself
                behaved like this.
     */
                In older versions, wxControlWithItems::GetSelection() itself
                behaved like this.
     */

-    int GetCurrentSelection() const;
+    virtual int GetCurrentSelection() const;

 
     /**
         Sets the number of columns in this choice item.
 
     /**
         Sets the number of columns in this choice item.


@@ -145,6 +175,6 @@ public:
         @remarks This is implemented for GTK and Motif only and doesn’t do 
                  anything under other platforms.
     */
         @remarks This is implemented for GTK and Motif only and doesn’t do 
                  anything under other platforms.
     */

-    void SetColumns(int n = 1);
+    virtual void SetColumns(int n = 1);

 };
 
 };