X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c00fed0ef4d70c9b45d9b8405f636d30eadb7ea6..99c4be680622f58a48a04dfe0835b59d2c41afea:/include/wx/msw/listbox.h?ds=inline diff --git a/include/wx/msw/listbox.h b/include/wx/msw/listbox.h index 1ed147948b..2d77f86c1a 100644 --- a/include/wx/msw/listbox.h +++ b/include/wx/msw/listbox.h @@ -19,7 +19,7 @@ // ---------------------------------------------------------------------------- #if wxUSE_OWNER_DRAWN - class WXDLLEXPORT wxOwnerDrawn; + class WXDLLIMPEXP_FWD_CORE wxOwnerDrawn; // define the array of list box items #include "wx/dynarray.h" @@ -28,13 +28,13 @@ #endif // wxUSE_OWNER_DRAWN // forward decl for GetSelections() -class WXDLLIMPEXP_BASE wxArrayInt; +class WXDLLIMPEXP_FWD_BASE wxArrayInt; // ---------------------------------------------------------------------------- // List box control // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxListBox : public wxListBoxBase +class WXDLLIMPEXP_CORE wxListBox : public wxListBoxBase { public: // ctors and such @@ -77,13 +77,9 @@ public: virtual ~wxListBox(); - // implement base class pure virtuals - virtual void Clear(); - virtual void Delete(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; @@ -105,9 +101,10 @@ public: int GetItemIndex(wxOwnerDrawn *item) const { return m_aItems.Index(item); } #endif // wxUSE_OWNER_DRAWN - // Windows-specific code to set the horizontal extent of the listbox, if - // necessary. If s is non-NULL, it's used to calculate the horizontal - // extent. Otherwise, all strings are used. + // Windows-specific code to update the horizontal extent of the listbox, if + // necessary. If s is non-empty, the horizontal extent is increased to the + // length of this string if it's currently too short, otherwise the maximum + // extent of all strings is used. In any case calls InvalidateBestSize() virtual void SetHorizontalExtent(const wxString& s = wxEmptyString); // Windows callbacks @@ -132,23 +129,31 @@ public: return GetCompositeControlsDefaultAttributes(variant); } + // returns true if the platform should explicitly apply a theme border + virtual bool CanApplyThemeBorder() const { return false; } + protected: + virtual void DoClear(); + virtual void DoDeleteOneItem(unsigned int n); + virtual void DoSetSelection(int n, bool select); - 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; virtual int DoListHitTest(const wxPoint& point) const; + bool m_updateHorizontalExtent; + virtual void OnInternalIdle(); + // free memory (common part of Clear() and dtor) void Free(); - int m_noItems; - int m_selected; + unsigned int m_noItems; virtual wxSize DoGetBestSize() const;