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

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

diff --git a/utils/HelpGen/src/docripper.cpp b/utils/HelpGen/src/docripper.cpp
index c479fcb8f9e48eb0a89ab9fae69e7a573b85fff5..738d01a05bdc23984f4b60facdfdae5f2deb779e 100644 (file)
--- a/utils/HelpGen/src/docripper.cpp
+++ b/utils/HelpGen/src/docripper.cpp
@@ -215,7 +215,7 @@ void RipperDocGen::AppendComments( spContext& fromContext, string& str )
     str += mTags[TAG_PARAGRAPH].end;
 }
 
-void RipperDocGen::AppendMulitilineStr( string& st, string& mlStr )
+void RipperDocGen::AppendMulitilineStr( wxString& st, wxString& mlStr )
 {
     st = mTags[TAG_FIXED_FONT].start;
     st += mlStr;

diff --git a/utils/HelpGen/src/docripper.h b/utils/HelpGen/src/docripper.h
index 9e29acd4a0abff60dc73658d93af07de13f2c8e3..b4a5c7b7f8e000e53bb2ed286b1a5c5ca8d9e31f 100644 (file)
--- a/utils/HelpGen/src/docripper.h
+++ b/utils/HelpGen/src/docripper.h
@@ -86,7 +86,7 @@ protected:
     // helpers
     void AppendComments( spContext& fromContext, string& str );
 
-    void AppendMulitilineStr( string& st, string& mlStr );
+    void AppendMulitilineStr( wxString& st, wxString& mlStr );
 
     void AppendHighlightedSource( string& st, string source );