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/src/HelpGen.cpp

@@ -40,10 +40,11 @@
 #ifndef WX_PRECOMP
     #include <wx/string.h>
     #include <wx/log.h>
-    #include <wx/file.h>
     #include <wx/dynarray.h>
 #endif // WX_PRECOMP
 
+#include <wx/file.h>
+
 // C++ parsing classes
 #include "cjparser.h"
 
@@ -69,6 +70,10 @@ static wxString GetAllComments(const spContext& ctx);
 
 // get the string with current time (returns pointer to static buffer)
 // timeFormat is used for the call of strftime(3)
+#ifdef GetCurrentTime
+#undef GetCurrentTime
+#endif
+
 static const char *GetCurrentTime(const char *timeFormat);
 
 // -----------------------------------------------------------------------------