X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f048e32fcd5260f33fbebdafbe1a0deeda175419..0d236fd0faa89b4c3da04facdd50817f03207093:/include/wx/msw/listbox.h diff --git a/include/wx/msw/listbox.h b/include/wx/msw/listbox.h index 7f7f1b679c..3a187be870 100644 --- a/include/wx/msw/listbox.h +++ b/include/wx/msw/listbox.h @@ -16,6 +16,8 @@ #pragma interface "listbox.h" #endif +#if wxUSE_LISTBOX + // ---------------------------------------------------------------------------- // simple types // ---------------------------------------------------------------------------- @@ -24,9 +26,9 @@ class WXDLLEXPORT wxOwnerDrawn; // define the array of list box items - #include + #include "wx/dynarray.h" - WX_DEFINE_EXPORTED_ARRAY(wxOwnerDrawn *, wxListBoxItemsArray); + WX_DEFINE_EXPORTED_ARRAY_NO_PTR(wxOwnerDrawn *, wxListBoxItemsArray); #endif // wxUSE_OWNER_DRAWN // forward decl for GetSelections() @@ -93,7 +95,7 @@ public: bool MSWOnDraw(WXDRAWITEMSTRUCT *item); // plug-in for derived classes - virtual wxOwnerDrawn *CreateItem(size_t n); + virtual wxOwnerDrawn *CreateLboxItem(size_t n); // allows to get the item and use SetXXX functions to set it's appearance wxOwnerDrawn *GetItem(size_t n) const { return m_aItems[n]; } @@ -113,9 +115,6 @@ public: virtual void SetupColours(); protected: - // do we have multiple selections? - bool HasMultipleSelection() const; - // free memory (common part of Clear() and dtor) void Free(); @@ -130,8 +129,10 @@ protected: #endif private: - DECLARE_DYNAMIC_CLASS(wxListBox) + DECLARE_DYNAMIC_CLASS_NO_COPY(wxListBox) }; +#endif // wxUSE_LISTBOX + #endif // _WX_LISTBOX_H_