X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8ef94bfc25eb21f1d3fa93b3d55c5a1ca18d8e62..d642db66a5efc82d374b813022c72ba88bc50839:/include/wx/gtk1/listbox.h diff --git a/include/wx/gtk1/listbox.h b/include/wx/gtk1/listbox.h index 4b74c4e7b6..c9d6a48501 100644 --- a/include/wx/gtk1/listbox.h +++ b/include/wx/gtk1/listbox.h @@ -12,7 +12,9 @@ #include "wx/list.h" -class WXDLLIMPEXP_BASE wxSortedArrayString; +typedef struct _GtkList GtkList; + +class WXDLLIMPEXP_FWD_BASE wxSortedArrayString; //----------------------------------------------------------------------------- // wxListBox @@ -32,7 +34,7 @@ public: const wxString& name = wxListBoxNameStr ) { #if wxUSE_CHECKLISTBOX - m_hasCheckBoxes = FALSE; + m_hasCheckBoxes = false; #endif // wxUSE_CHECKLISTBOX Create(parent, id, pos, size, n, choices, style, validator, name); } @@ -45,7 +47,7 @@ public: const wxString& name = wxListBoxNameStr ) { #if wxUSE_CHECKLISTBOX - m_hasCheckBoxes = FALSE; + m_hasCheckBoxes = false; #endif // wxUSE_CHECKLISTBOX Create(parent, id, pos, size, choices, style, validator, name); } @@ -67,12 +69,12 @@ public: const wxString& name = wxListBoxNameStr); // implement base class pure virtuals - virtual void Clear(); - virtual void Delete(int n); + virtual void DoClear(); + virtual void DoDeleteOneItem(unsigned int n); - virtual int GetCount() const; - virtual wxString GetString(int n) const; - virtual void SetString(int n, const wxString& s); + virtual unsigned int GetCount() const; + virtual wxString GetString(unsigned int n) const; + virtual void SetString(unsigned int n, const wxString& s); virtual int FindString(const wxString& s, bool bCase = false) const; virtual bool IsSelected(int n) const; @@ -80,16 +82,14 @@ public: virtual int GetSelection() const; virtual int GetSelections(wxArrayInt& aSelections) const; - virtual int DoAppend(const wxString& item); - virtual void DoInsertItems(const wxArrayString& items, int pos); - virtual void DoSetItems(const wxArrayString& items, void **clientData); + virtual int DoInsertItems(const wxArrayStringsAdapter& items, + unsigned int pos, + void **clientData, wxClientDataType type); virtual void DoSetFirstItem(int n); - 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 DoSetItemClientData(unsigned int n, void* clientData); + virtual void* DoGetItemClientData(unsigned int n) const; static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);