--- ../include/wx/mac/combobox.h	Sat Feb  7 13:16:42 2004
+++ ../include/wx/mac/combobox.h.new	Sat Feb  7 13:17:58 2004
@@ -23,7 +23,7 @@
 WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
 
 // Combobox item
-class WXDLLEXPORT wxComboBox: public wxChoice
+class WXDLLEXPORT wxComboBox: public wxComboBoxBase , public wxControl
 {
   DECLARE_DYNAMIC_CLASS(wxComboBox)
 
@@ -65,14 +65,16 @@
            const wxString& name = wxComboBoxNameStr);
 
   // List functions
-  virtual void Append(const wxString& item);
   virtual void Delete(int n);
   virtual void Clear();
+
   virtual int GetSelection() const ;
   virtual void SetSelection(int n);
+    virtual void Select(int n) { SetSelection(n) ; }
   virtual int FindString(const wxString& s) const;
   virtual wxString GetString(int n) const ;
   virtual wxString GetStringSelection() const ;
+    virtual void SetString(int n, const wxString& s) ;
   virtual bool SetStringSelection(const wxString& sel);
   
   // Text field functions
@@ -93,7 +95,23 @@
   virtual void SetEditable(bool editable);
   virtual int GetCount() const { return m_choice->GetCount() ; }
   void MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ;
+
+    // avoid ambiguities
+    void SetClientObject(int n, wxClientData* clientData)
+    { wxItemContainer::SetClientObject(n, clientData); }
+    wxClientData* GetClientObject(int n) const
+    { return wxItemContainer::GetClientObject(n); }
+
+
 protected:
+    virtual int DoAppend(const wxString& item) ;
+    virtual int DoInsert(const wxString& item, int pos) ;
+
+    virtual void DoSetItemClientData(int n, void* clientData) ;
+    virtual void* DoGetItemClientData(int n) const ;
+    virtual void DoSetItemClientObject(int n, wxClientData* clientData) ;
+    virtual wxClientData* DoGetItemClientObject(int n) const ;
+
     // the subcontrols
     wxTextCtrl*     m_text;
     wxChoice*       m_choice;
