X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/990ff5ecebcdeaf78a44b043e070cfdfd0a3d70e..1338c59a025505bc066be220fe56e898a72b3ad3:/include/wx/univ/combobox.h

diff --git a/include/wx/univ/combobox.h b/include/wx/univ/combobox.h
index bd472fea05..5ef092afbd 100644
--- a/include/wx/univ/combobox.h
+++ b/include/wx/univ/combobox.h
@@ -83,6 +83,8 @@ public:
     // called immediately after the control is shown
     virtual void OnShow() = 0;
 
+    virtual wxCoord GetBestWidth() const {return 0; }
+
 protected:
     wxComboControl *m_combo;
 };
@@ -160,6 +162,10 @@ public:
     virtual bool Enable(bool enable = TRUE);
     virtual bool Show(bool show = TRUE);
 
+#if wxUSE_TOOLTIPS
+    virtual void DoSetToolTip( wxToolTip *tip );
+#endif // wxUSE_TOOLTIPS
+
 protected:
     // override the base class virtuals involved into geometry calculations
     virtual wxSize DoGetBestClientSize() const;
@@ -270,14 +276,17 @@ public:
     virtual void Select(int n);
     virtual int GetSelection() const;
     void SetSelection(int n) { Select(n); }
-    
+
     void SetStringSelection(const wxString& s) {  }
 
     // we have to redefine these functions here to avoid ambiguities in classes
-    // deriving from us which would arise otherwise because both base classses
-    // have the methods with the same names - hopefully, a smart compiler can
-    // optimize away these simple inline wrappers so we don't suffer much from
-    // this
+    // deriving from us which would arise otherwise because we inherit these
+    // methods (with different signatures) from both wxItemContainer via
+    // wxComboBoxBase (with "int n" parameter) and from wxEvtHandler via
+    // wxControl and wxComboControl (without)
+    //
+    // hopefully, a smart compiler can optimize away these simple inline
+    // wrappers so we don't suffer much from this
 
     void SetClientData(void *data)
     {
@@ -321,6 +330,7 @@ public:
 
 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);