X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0ce0b76b50851713e8318d0cdb0d4a6cda926f21..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/include/wx/mac/carbon/combobox.h diff --git a/include/wx/mac/carbon/combobox.h b/include/wx/mac/carbon/combobox.h index 7c574d008f..c38095768d 100644 --- a/include/wx/mac/carbon/combobox.h +++ b/include/wx/mac/carbon/combobox.h @@ -15,7 +15,7 @@ #include "wx/containr.h" #include "wx/choice.h" -WXDLLEXPORT_DATA(extern const wxChar) wxComboBoxNameStr[]; +WXDLLEXPORT_DATA(extern const char) wxComboBoxNameStr[]; // forward declaration of private implementation classes @@ -84,21 +84,18 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase const wxValidator& validator = wxDefaultValidator, const wxString& name = wxComboBoxNameStr); - // List functions - virtual void Delete(int n); - virtual void Clear(); - virtual int GetSelection() const; - int GetCurrentSelection() const { return GetSelection(); } virtual void SetSelection(int n); virtual int FindString(const wxString& s, bool bCase = false) const; - virtual wxString GetString(int n) const; + virtual wxString GetString(unsigned int n) const; virtual wxString GetStringSelection() const; - virtual void SetString(int n, const wxString& s); + virtual void SetString(unsigned int n, const wxString& s); // Text field functions - virtual wxString GetValue() const; virtual void SetValue(const wxString& value); + virtual wxString GetValue() const; + virtual void WriteText(const wxString& text); + virtual void GetSelection(long *from, long *to) const; // Clipboard operations virtual void Copy(); @@ -114,7 +111,7 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase virtual void SetEditable(bool editable); virtual bool IsEditable() const; - virtual int GetCount() const; + virtual unsigned int GetCount() const; virtual void Undo(); virtual void Redo(); @@ -126,6 +123,8 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase virtual bool CanUndo() const; virtual bool CanRedo() const; + virtual wxClientDataType GetClientDataType() const; + wxInt32 MacControlHit( WXEVENTHANDLERREF handler, WXEVENTREF event ); wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST @@ -136,19 +135,22 @@ protected: // common part of all ctors void Init(); - void FreeData(); + // List functions + virtual void DoDeleteOneItem(unsigned int n); + virtual void DoClear(); // override the base class virtuals involved in geometry calculations virtual wxSize DoGetBestSize() const; virtual void DoMoveWindow(int x, int y, int width, int height); - virtual int DoAppend(const wxString& item); - virtual int DoInsert(const wxString& item, int pos); + virtual int DoInsertItems(const wxArrayStringsAdapter& items, + unsigned int pos, + void **clientData, wxClientDataType type); + + virtual void DoSetItemClientData(unsigned int n, void* clientData); + virtual void * DoGetItemClientData(unsigned int n) const; - 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; + virtual void SetClientDataType(wxClientDataType clientDataItemsType); // the subcontrols wxComboBoxText* m_text;