added wxGet/SetWindowProc/UserData()

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

diff --git a/include/wx/mac/combobox.h b/include/wx/mac/combobox.h
index fcdba4fef309f1a1680784f7ea87807ed0719bdd..68b3b0282074b94315b119bca3c93ca6f3b54f6a 100644 (file)
--- a/include/wx/mac/combobox.h
+++ b/include/wx/mac/combobox.h
@@ -22,7 +22,7 @@
 WXDLLEXPORT_DATA(extern const wxChar*) wxComboBoxNameStr;
 
 // Combobox item
 WXDLLEXPORT_DATA(extern const wxChar*) wxComboBoxNameStr;
 
 // Combobox item

-class WXDLLEXPORT wxComboBox: public wxComboBoxBase , public wxControl
+class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase

 {
   DECLARE_DYNAMIC_CLASS(wxComboBox)
 
 {
   DECLARE_DYNAMIC_CLASS(wxComboBox)
 


@@ -53,6 +53,17 @@ class WXDLLEXPORT wxComboBox: public wxComboBoxBase , public wxControl
     {
     Create(parent, id, value, pos, size, n, choices, style, validator, name);
     }
     {
     Create(parent, id, value, pos, size, n, choices, style, validator, name);
     }

+    inline 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)
+    {
+    Create(parent, id, value, pos, size, choices, style, validator, name);
+    }

 
     bool Create(wxWindow *parent, wxWindowID id,
            const wxString& value = wxEmptyString,
 
     bool Create(wxWindow *parent, wxWindowID id,
            const wxString& value = wxEmptyString,


@@ -62,6 +73,14 @@ class WXDLLEXPORT wxComboBox: public wxComboBoxBase , public wxControl
            long style = 0,
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxComboBoxNameStr);
            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);

 
     // List functions
     virtual void Delete(int n);
 
     // List functions
     virtual void Delete(int n);


@@ -95,6 +114,8 @@ class WXDLLEXPORT wxComboBox: public wxComboBoxBase , public wxControl
     virtual int GetCount() const { return m_choice->GetCount() ; }
     void MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
 
     virtual int GetCount() const { return m_choice->GetCount() ; }
     void MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
 

+    wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
+

 protected:
     virtual int DoAppend(const wxString& item) ;
     virtual int DoInsert(const wxString& item, int pos) ;
 protected:
     virtual int DoAppend(const wxString& item) ;
     virtual int DoInsert(const wxString& item, int pos) ;


@@ -104,6 +125,8 @@ protected:
     virtual void DoSetItemClientObject(int n, wxClientData* clientData) ;
     virtual wxClientData* DoGetItemClientObject(int n) const ;
 
     virtual void DoSetItemClientObject(int n, wxClientData* clientData) ;
     virtual wxClientData* DoGetItemClientObject(int n) const ;
 

+    void FreeData();
+

     // the subcontrols
     wxTextCtrl*     m_text;
     wxChoice*       m_choice;
     // the subcontrols
     wxTextCtrl*     m_text;
     wxChoice*       m_choice;