remove unused #defines; fix include header for MinGW32 wxMSW Trunk

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52745 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/utils/ifacecheck/src/xmlparser.cpp b/utils/ifacecheck/src/xmlparser.cpp
index c36cc450d6ee6ce147208351121c24553f10cce3..8a74a8e8dff125777ac827b12e1d70fa70b39c12 100644 (file)
--- a/utils/ifacecheck/src/xmlparser.cpp
+++ b/utils/ifacecheck/src/xmlparser.cpp
@@ -22,7 +22,7 @@
 #include "wx/xml/xml.h"
 #include "wx/wfstream.h"
 #include "wx/arrimpl.cpp"
 #include "wx/xml/xml.h"
 #include "wx/wfstream.h"
 #include "wx/arrimpl.cpp"

-#include "wx/dynarray.h"
+#include "wx/hashmap.h"

 #include "wx/filename.h"
 
 #include <errno.h>
 #include "wx/filename.h"
 
 #include <errno.h>


@@ -31,8 +31,6 @@
 
 #define PROGRESS_RATE             1000     // each PROGRESS_RATE nodes processed print a dot
 #define ESTIMATED_NUM_CLASSES     600      // used by both wxXmlInterface-derived classes to prealloc mem
 
 #define PROGRESS_RATE             1000     // each PROGRESS_RATE nodes processed print a dot
 #define ESTIMATED_NUM_CLASSES     600      // used by both wxXmlInterface-derived classes to prealloc mem

-#define ESTIMATED_NUM_TYPES       50000    // used only by wxGccXmlInterface to prealloc mem
-#define ESTIMATED_NUM_FILES       800      // used only by wxGccXmlInterface to prealloc mem

 
 WX_DEFINE_OBJARRAY(wxTypeArray)
 WX_DEFINE_OBJARRAY(wxMethodArray)
 
 WX_DEFINE_OBJARRAY(wxTypeArray)
 WX_DEFINE_OBJARRAY(wxMethodArray)


@@ -460,14 +458,12 @@ bool wxXmlGccInterface::Parse(const wxString& filename)
     }
 
     wxToResolveTypeHashMap toResolveTypes;
     }
 
     wxToResolveTypeHashMap toResolveTypes;

-    //wxArrayString arrMemberIds;

     wxClassMemberIdHashMap members;
     wxTypeIdHashMap types;
     wxTypeIdHashMap files;
 
     // prealloc quite a lot of memory!
     m_classes.Alloc(ESTIMATED_NUM_CLASSES);
     wxClassMemberIdHashMap members;
     wxTypeIdHashMap types;
     wxTypeIdHashMap files;
 
     // prealloc quite a lot of memory!
     m_classes.Alloc(ESTIMATED_NUM_CLASSES);

-    //arrMemberIds.Alloc(ESTIMATED_NUM_TYPES);

 
     // build a list of wx classes and in general of all existent types
     child = doc.GetRoot()->GetChildren();
 
     // build a list of wx classes and in general of all existent types
     child = doc.GetRoot()->GetChildren();