reverted the change to not use wxList until dynarray.h is fixed to provide operator* in both STL and non-STL modes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40349 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2006-07-28 07:14:14 +00:00
parent 122ff921f0
commit 8e8a4e8587
2 changed files with 15 additions and 11 deletions

View File

@@ -18,6 +18,7 @@
#include "wx/string.h"
#include "wx/dynarray.h"
#include "wx/datetime.h"
#include "wx/list.h"
#include "wx/gdicmn.h"
#include "wx/filesys.h"
#include "wx/bitmap.h"
@@ -87,10 +88,6 @@ WX_DECLARE_USER_EXPORTED_OBJARRAY(wxXmlResourceDataRecord,
wxXmlResourceDataRecords,
WXDLLIMPEXP_XRC);
WX_DEFINE_USER_EXPORTED_ARRAY_PTR(wxXmlResourceHandler*,
wxXmlResourceHandlers,
class WXDLLIMPEXP_XRC);
enum wxXmlResourceFlags
{
wxXRC_USE_LOCALE = 1,
@@ -277,7 +274,7 @@ private:
long m_version;
int m_flags;
wxXmlResourceHandlers m_handlers;
wxList m_handlers;
wxXmlResourceDataRecords m_data;
#if wxUSE_FILESYSTEM
wxFileSystem m_curFileSystem;