Nuke GTK1 from include/gtk

[wxWidgets.git] / include / wx / os2 / choice.h

diff --git a/include/wx/os2/choice.h b/include/wx/os2/choice.h
index 098c7117522bfec9617ee2cb7b45c92bcbe76592..5700c35de47fe309fd60d45c426b95c366ae1e7f 100644 (file)
--- a/include/wx/os2/choice.h
+++ b/include/wx/os2/choice.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        choice.h
+// Name:        wx/os2/choice.h
 // Purpose:     wxChoice class
 // Author:      David Webster
 // Modified by:
@@ -44,6 +44,27 @@ public:
               );
     }
 
+    inline wxChoice( wxWindow*            pParent
+                    ,wxWindowID           vId
+                    ,const wxPoint&       rPos
+                    ,const wxSize&        rSize
+                    ,const wxArrayString& asChoices
+                    ,long                 lStyle = 0
+                    ,const wxValidator&   rValidator = wxDefaultValidator
+                    ,const wxString&      rsName = wxChoiceNameStr
+                   )
+    {
+        Create( pParent
+               ,vId
+               ,rPos
+               ,rSize
+               ,asChoices
+               ,lStyle
+               ,rValidator
+               ,rsName
+              );
+    }
+
     bool Create( wxWindow*          pParent
                 ,wxWindowID         vId
                 ,const wxPoint&     rPos = wxDefaultPosition
@@ -55,10 +76,21 @@ public:
                 ,const wxString&    rsName = wxChoiceNameStr
                );
 
+    bool Create( wxWindow*            pParent
+                ,wxWindowID           vId
+                ,const wxPoint&       rPos
+                ,const wxSize&        rSize
+                ,const wxArrayString& asChoices
+                ,long                 lStyle = 0
+                ,const wxValidator&   rValidator = wxDefaultValidator
+                ,const wxString&      rsName = wxChoiceNameStr
+               );
+
     //
     // Implement base class virtuals
     //
     virtual int      DoAppend(const wxString& rsItem);
+    virtual int      DoInsert(const wxString& rsItem, int pos);
     virtual void     Delete(int n);
     virtual void     Clear(void);
 
@@ -66,7 +98,6 @@ public:
     virtual int      GetSelection(void) const ;
     virtual void     SetSelection(int n);
 
-    virtual int      FindString(const wxString& rsStr) const;
     virtual wxString GetString(int n) const ;
     virtual void     SetString( int n
                                ,const wxString& rsStr