More SC++ fixes; HelpGen starting to compile with VC++; image sample now compiles/runs

with VC++


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

utils/HelpGen/include/srcparser.h

@@ -15,7 +15,6 @@
 #define __SRCPARSER_G__
 
 #if defined( wxUSE_TEMPLATE_STL )
-
 	#include <vector>
 
 	#ifdef WIN32
@@ -28,7 +27,6 @@
 	#endif
 
 #else
-
 	#include "wx/string.h"
 	#include "wxstlvec.h"
 

utils/HelpGen/include/wxstlac.h

@@ -12,13 +12,16 @@
 #ifndef __WXSTLAC_G__
 #define __WXSTLAC_G__
 
+#ifdef new
+#undef new
+#endif
+
 #include <stddef.h>
 #include <sys/types.h>
 #include <memory.h>
 #include <limits.h>
 #include <new.h>
 
-
 // the below macro used internally (see actual interface after this macro)
 
 // arguments:

utils/HelpGen/include/wxstllst.h

@@ -12,6 +12,10 @@
 #ifndef __WXSTLLST_G__
 #define __WXSTLLST_G__
 
+#ifdef new
+#undef new
+#endif
+
 #include <stddef.h>
 #include <sys/types.h>
 #include <memory.h>

utils/HelpGen/include/wxstlvec.h

@@ -12,6 +12,10 @@
 #ifndef __WXSTLVEC_G__
 #define __WXSTLVEC_G__
 
+#ifdef new
+#undef new
+#endif
+
 #include <memory.h>
 #include <string.h>  // imports memmove()
 #include <stddef.h>