X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8228b8932abaedadbf9568bb3a1eef3ae25fb2a3..9869c26285dc51d13607cddaa04f65ce983653a5:/include/wx/os2/listbox.h?ds=inline diff --git a/include/wx/os2/listbox.h b/include/wx/os2/listbox.h index 01070daa9e..dc6d6913b9 100644 --- a/include/wx/os2/listbox.h +++ b/include/wx/os2/listbox.h @@ -4,7 +4,6 @@ // Author: David Webster // Modified by: // Created: 10/09/99 -// RCS-ID: $Id$ // Copyright: (c) David Webster // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -17,7 +16,7 @@ // ---------------------------------------------------------------------------- #if wxUSE_OWNER_DRAWN - class WXDLLEXPORT wxOwnerDrawn; + class WXDLLIMPEXP_FWD_CORE wxOwnerDrawn; // define the array of list box items #include "wx/dynarray.h" @@ -32,7 +31,7 @@ class wxArrayInt; // List box control // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxListBox : public wxListBoxBase +class WXDLLIMPEXP_CORE wxListBox : public wxListBoxBase { public: // ctors and such @@ -103,34 +102,22 @@ public: // // Implement base class pure virtuals // - virtual void Clear(void); - virtual void Delete(int n); + virtual void DoClear(void); + virtual void DoDeleteOneItem(unsigned int n); - virtual size_t GetCount() const; - virtual wxString GetString(int n) const; - virtual void SetString(int n, const wxString& rsString); + virtual unsigned int GetCount() const; + virtual wxString GetString(unsigned int n) const; + virtual void SetString(unsigned int n, const wxString& rsString); virtual bool IsSelected(int n) const; virtual void DoSetSelection(int n, bool bSelect); virtual int GetSelection(void) const; virtual int GetSelections(wxArrayInt& raSelections) const; - virtual int DoAppend(const wxString& rsItem); - virtual void DoInsertItems( const wxArrayString& raItems, int rPos ); - virtual void DoSetItems( const wxArrayString& raItems - ,void ** ppClientData - ); - virtual void DoSetFirstItem(int n); - virtual void DoSetItemClientData( int n - ,void* pClientData - ); - virtual void* DoGetItemClientData(int n) const; - virtual void DoSetItemClientObject( int n - ,wxClientData* pClientData - ); - virtual wxClientData* DoGetItemClientObject(int n) const; + virtual void DoSetItemClientData(unsigned int n, void* pClientData); + virtual void* DoGetItemClientData(unsigned int n) const; // // wxCheckListBox support @@ -154,8 +141,8 @@ protected: bool HasMultipleSelection(void) const; virtual wxSize DoGetBestSize(void) const; - size_t m_nNumItems; - int m_nSelected; + unsigned int m_nNumItems; + int m_nSelected; #if wxUSE_OWNER_DRAWN // @@ -164,7 +151,14 @@ protected: wxListBoxItemsArray m_aItems; #endif -private: + // + // Implement base wxItemContainer virtuals + // + virtual int DoInsertItems(const wxArrayStringsAdapter& items, + unsigned int pos, + void **clientData, + wxClientDataType type); + DECLARE_DYNAMIC_CLASS(wxListBox) }; // end of wxListBox