More warning and error fixes (work in progress with Tinderbox).

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

utils/HelpGen/src/sourcepainter.h

@@ -32,13 +32,6 @@
     #include "wxstlvec.h"
     #include "wx/string.h"
 
-    #if wxUSE_STD_STRING
-        using std::string;
-    #else
-        // FIXME:: dirty!
-        #define  string wxString
-    #endif
-
     typedef WXSTL_VECTOR_SHALLOW_COPY(int) SPBlockListT;
 
 #endif
@@ -63,7 +56,7 @@
 class SourcePainter
 {
 protected:
-    string          mResultStr;
+    wxString        mResultStr;
     SPBlockListT    mBlocks;
     bool            mCollectResultsOn;