Don't define wxArrayPGProperty as std::vector in STL build.
wxArray::Remove() method is used on it so defining it as std::vector<> breaks compilation in STL build. It is also insonsistent with all the other arrays in wx none of which used "#if wxUSE_STL" around its definition. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61691 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -342,13 +342,9 @@ typedef wxString wxPGCachedString;
|
||||
|
||||
#ifndef SWIG
|
||||
|
||||
#if wxUSE_STL
|
||||
typedef std::vector<wxPGProperty*> wxArrayPGProperty;
|
||||
#else
|
||||
WX_DEFINE_TYPEARRAY_WITH_DECL_PTR(wxPGProperty*, wxArrayPGProperty,
|
||||
wxBaseArrayPtrVoid,
|
||||
class WXDLLIMPEXP_PROPGRID);
|
||||
#endif
|
||||
|
||||
// Always use wxString based hashmap with unicode, stl, swig and GCC 4.0+
|
||||
WX_DECLARE_STRING_HASH_MAP_WITH_DECL(void*,
|
||||
@@ -358,7 +354,7 @@ WX_DECLARE_STRING_HASH_MAP_WITH_DECL(void*,
|
||||
WX_DECLARE_STRING_HASH_MAP_WITH_DECL(wxString,
|
||||
wxPGHashMapS2S,
|
||||
class WXDLLIMPEXP_PROPGRID);
|
||||
|
||||
|
||||
WX_DECLARE_VOIDPTR_HASH_MAP_WITH_DECL(void*,
|
||||
wxPGHashMapP2P,
|
||||
class WXDLLIMPEXP_PROPGRID);
|
||||
|
Reference in New Issue
Block a user