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

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

diff --git a/utils/HelpGen/src/docripper.cpp b/utils/HelpGen/src/docripper.cpp
index 738d01a05bdc23984f4b60facdfdae5f2deb779e..219b65b8f1b67ecee691dd74474eb820833dd7a7 100644 (file)
--- a/utils/HelpGen/src/docripper.cpp
+++ b/utils/HelpGen/src/docripper.cpp
@@ -164,7 +164,7 @@ RipperDocGen::~RipperDocGen()
     delete mpFileBinderCtx;
 }
 
-void RipperDocGen::AppendComments( spContext& fromContext, string& str )
+void RipperDocGen::AppendComments( spContext& fromContext, wxString& str )
 {
     if ( !fromContext.HasComments() ) return;
 
@@ -206,11 +206,11 @@ void RipperDocGen::AppendComments( spContext& fromContext, string& str )
                      ( str[n] == 10 && str[n+1] == 10 )
                    )
                 {
-                    str.insert( n + 1, "<p>" ); // FIXME:: quick-hack
+                    str.insert( n + 1, _T("<p>") ); // FIXME:: quick-hack
                     len += 3;
                 }
             }
-            str[n] = ' ';
+            str[n] = _T(' ');
         }
     str += mTags[TAG_PARAGRAPH].end;
 }
@@ -222,7 +222,7 @@ void RipperDocGen::AppendMulitilineStr( wxString& st, wxString& mlStr )
     st += mTags[TAG_FIXED_FONT].end;
 }
 
-void RipperDocGen::AppendHighlightedSource( string& st, string source )
+void RipperDocGen::AppendHighlightedSource( wxString& st, wxString source )
 {
     // FIXME:: below should not be fixed :)
     char buf[1024*32];

diff --git a/utils/HelpGen/src/docripper.h b/utils/HelpGen/src/docripper.h
index b4a5c7b7f8e000e53bb2ed286b1a5c5ca8d9e31f..0cba6c0be7a37534bfb8cdec9c2d8a119e5a526b 100644 (file)
--- a/utils/HelpGen/src/docripper.h
+++ b/utils/HelpGen/src/docripper.h
@@ -84,11 +84,11 @@ protected:
 
 protected:
     // helpers
-    void AppendComments( spContext& fromContext, string& str );
+    void AppendComments( spContext& fromContext, wxString& str );
 
     void AppendMulitilineStr( wxString& st, wxString& mlStr );
 
-    void AppendHighlightedSource( string& st, string source );
+    void AppendHighlightedSource( wxString& st, wxString source );
 
     // returns true, if no comments found in the context,
     // plus, creates dummy(empty) section, and puts a