]> git.saurik.com Git - wxWidgets.git/commitdiff
Don't define wxArrayPGProperty as std::vector in STL build.
authorVadim Zeitlin <vadim@wxwidgets.org>
Tue, 18 Aug 2009 00:27:21 +0000 (00:27 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Tue, 18 Aug 2009 00:27:21 +0000 (00:27 +0000)
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

include/wx/propgrid/propgriddefs.h

index f2c3aab9638d91b1b021094409756f36e91aa784..02312253ddc16fd5adecf2bfff539801e55fe878 100644 (file)
@@ -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);