Avoid double free in wxComboBox::SetClientObject.

[wxWidgets.git] / include / wx / univ / combobox.h

diff --git a/include/wx/univ/combobox.h b/include/wx/univ/combobox.h
index cb61271782b578f849b1574763b02e5d346b1ee9..28be5a0a2e5f44a22a8cd9d04dd48f2524a39778 100644 (file)
--- 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 "combobox.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;
@@ -174,7 +180,7 @@ protected:
                                const wxString& strArg = wxEmptyString);
 
     // event handlers
-    void OnKey(wxCommandEvent& event);
+    void OnKey(wxKeyEvent& event);
 
     // common part of all ctors
     void Init();
@@ -271,8 +277,13 @@ public:
     virtual int GetSelection() const;
     void SetSelection(int n) { Select(n); }
 
+    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);
@@ -301,7 +312,7 @@ class WXDLLEXPORT wxStdComboBoxInputHandler : public wxStdInputHandler
 public:
     wxStdComboBoxInputHandler(wxInputHandler *inphand);
 
-    virtual bool HandleKey(wxControl *control,
+    virtual bool HandleKey(wxInputConsumer *consumer,
                            const wxKeyEvent& event,
                            bool pressed);
 };