X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2e9f62dafb75dc5baa3800af456d1b0248d85357..15bc1a64a82f79768174325ae05f4ef4f68f8469:/include/wx/univ/combobox.h

diff --git a/include/wx/univ/combobox.h b/include/wx/univ/combobox.h
index e37418390a..52fa4b46b8 100644
--- a/include/wx/univ/combobox.h
+++ b/include/wx/univ/combobox.h
@@ -36,8 +36,8 @@
 #ifndef _WX_UNIV_COMBOBOX_H_
 #define _WX_UNIV_COMBOBOX_H_
 
-#ifdef __GNUG__
-    #pragma implementation "univcombobox.h"
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #pragma interface "univcombobox.h"
 #endif
 
 class WXDLLEXPORT wxComboControl;
@@ -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;
@@ -215,7 +221,7 @@ public:
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                int n = 0,
-               const wxString *choices = (const wxString *) NULL,
+               const wxString choices[] = (const wxString *) NULL,
                long style = 0,
                const wxValidator& validator = wxDefaultValidator,
                const wxString& name = wxComboBoxNameStr)
@@ -225,6 +231,15 @@ public:
         (void)Create(parent, id, value, pos, size, n, choices,
                      style, validator, name);
     }
+    wxComboBox(wxWindow *parent,
+               wxWindowID id,
+               const wxString& value,
+               const wxPoint& pos,
+               const wxSize& size,
+               const wxArrayString& choices,
+               long style = 0,
+               const wxValidator& validator = wxDefaultValidator,
+               const wxString& name = wxComboBoxNameStr);
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
@@ -236,7 +251,15 @@ public:
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxComboBoxNameStr);
-
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxString& value,
+                const wxPoint& pos,
+                const wxSize& size,
+                const wxArrayString& choices,
+                long style = 0,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxComboBoxNameStr);
 
     virtual ~wxComboBox();
 
@@ -270,11 +293,14 @@ public:
     virtual void Select(int n);
     virtual int GetSelection() const;
     void SetSelection(int n) { Select(n); }
-    
-    void SetStringSelection(const wxString& s) {  }
+
+    void SetStringSelection(const wxString& WXUNUSED(s)) {  }
+
+    wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
 
 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);