Add test for absence of events from wxSpinCtrlDouble ctor.

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

diff --git a/interface/wx/choice.h b/interface/wx/choice.h
index 975052193e119e83336ebd19bfb37d093bd4a0bc..25ad6bbfce041125bb673c892a3a95f4584620ee 100644 (file)
--- a/interface/wx/choice.h
+++ b/interface/wx/choice.h
@@ -2,8 +2,7 @@
 // Name:        choice.h
 // Purpose:     interface of wxChoice
 // Author:      wxWidgets team
 // Name:        choice.h
 // Purpose:     interface of wxChoice
 // Author:      wxWidgets team

-// RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence

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


@@ -20,17 +19,18 @@
 
     @beginEventEmissionTable{wxCommandEvent}
     @event{EVT_CHOICE(id, func)}
 
     @beginEventEmissionTable{wxCommandEvent}
     @event{EVT_CHOICE(id, func)}

-           Process a wxEVT_COMMAND_CHOICE_SELECTED event, when an item on the
+           Process a @c wxEVT_CHOICE event, when an item on the

            list is selected.
     @endEventTable
 
     @library{wxcore}
     @category{ctrl}
            list is selected.
     @endEventTable
 
     @library{wxcore}
     @category{ctrl}

-    @appearance{choice.png}
+    @appearance{choice}

 
     @see wxListBox, wxComboBox, wxCommandEvent
 */
 
     @see wxListBox, wxComboBox, wxCommandEvent
 */

-class wxChoice : public wxControlWithItems
+class wxChoice : public wxControl,
+                 public wxItemContainer

 {
 public:
     /**
 {
 public:
     /**


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

-    //@{

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


@@ -67,13 +66,6 @@ public:
 
         @see Create(), wxValidator
 
 
         @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
-

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


@@ -109,13 +101,6 @@ public:
 
         @see Create(), wxValidator
 
 
         @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
-

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


@@ -127,7 +112,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.


@@ -186,5 +170,15 @@ public:
                  anything under other platforms.
     */
     virtual void SetColumns(int n = 1);
                  anything under other platforms.
     */
     virtual void SetColumns(int n = 1);

+
+    virtual bool IsSorted() const;
+    
+    virtual unsigned int GetCount() const ;
+    virtual int GetSelection() const ;
+    virtual void SetSelection(int n);
+
+    virtual int FindString(const wxString& s, bool bCase = false) const;
+    virtual wxString GetString(unsigned int n) const ;
+    virtual void SetString(unsigned int pos, const wxString& s);

 };
 
 };