X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..ae54422d9d02ebd0a244998ef9117beff1432268:/include/wx/msw/listbox.h diff --git a/include/wx/msw/listbox.h b/include/wx/msw/listbox.h index a6e9766278..9574e73e9f 100644 --- a/include/wx/msw/listbox.h +++ b/include/wx/msw/listbox.h @@ -12,7 +12,7 @@ #ifndef _WX_LISTBOX_H_ #define _WX_LISTBOX_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "listbox.h" #endif @@ -26,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_PTR(wxOwnerDrawn *, wxListBoxItemsArray); #endif // wxUSE_OWNER_DRAWN // forward decl for GetSelections() @@ -95,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]; } @@ -129,7 +129,7 @@ protected: #endif private: - DECLARE_DYNAMIC_CLASS(wxListBox) + DECLARE_DYNAMIC_CLASS_NO_COPY(wxListBox) }; #endif // wxUSE_LISTBOX