From 8f8955b2b9ae58dfeb465d16915381e276923234 Mon Sep 17 00:00:00 2001 From: Artur Wieczorek Date: Mon, 7 Jan 2019 21:54:15 +0100 Subject: [PATCH] Use wxVector instead of wxArrayPGObject --- include/wx/propgrid/propgrid.h | 2 +- include/wx/propgrid/propgriddefs.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/wx/propgrid/propgrid.h b/include/wx/propgrid/propgrid.h index 4cbda4c90d..7a4587a63f 100644 --- a/include/wx/propgrid/propgrid.h +++ b/include/wx/propgrid/propgrid.h @@ -1580,7 +1580,7 @@ protected: #if !WXWIN_COMPATIBILITY_3_0 // List of editors and their event handlers to be deleted in idle event handler. - wxArrayPGObject m_deletedEditorObjects; + wxVector m_deletedEditorObjects; #endif // List of key codes that will not be handed over to editor controls. diff --git a/include/wx/propgrid/propgriddefs.h b/include/wx/propgrid/propgriddefs.h index 91ee22a8c5..1a18eccbac 100644 --- a/include/wx/propgrid/propgriddefs.h +++ b/include/wx/propgrid/propgriddefs.h @@ -312,9 +312,11 @@ WX_DECLARE_HASH_SET_WITH_DECL(int, wxPGHashSetInt, class WXDLLIMPEXP_PROPGRID); +#if WXWIN_COMPATIBILITY_3_0 WX_DEFINE_TYPEARRAY_WITH_DECL_PTR(wxObject*, wxArrayPGObject, wxBaseArrayPtrVoid, class WXDLLIMPEXP_PROPGRID); +#endif // WXWIN_COMPATIBILITY_3_0 // -----------------------------------------------------------------------