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

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

diff --git a/utils/HelpGen/src/ifcontext.cpp b/utils/HelpGen/src/ifcontext.cpp
index 01488de4db23f5526b7c4f64194106ed7d68e47c..1c5a41a163c39ddc12a31a294ff3a1ed76b669fa 100644 (file)
--- a/utils/HelpGen/src/ifcontext.cpp
+++ b/utils/HelpGen/src/ifcontext.cpp
@@ -92,8 +92,8 @@ void spInterFileContext::InsertBookmarkSorted( BookmarkListT& lst, spBookmark& m
     lst.push_back( mark );
 }
 
-void spInterFileContext::DoAppendSourceFragment( string& source,
-                                                 string& result,
+void spInterFileContext::DoAppendSourceFragment( wxString& source,
+                                                 wxString& result,
                                                  size_t  pos, size_t len )
 {
     mFiltered.erase( mFiltered.begin(), mFiltered.end() );
@@ -132,8 +132,8 @@ void spInterFileContext::DoAppendSourceFragment( string& source,
 }
 
 void spInterFileContext::GenerateContextBody( spContext& ctx,
-                                              string&    source,
-                                              string&    result,
+                                              wxString&  source,
+                                              wxString&  result,
                                               size_t&    lastSavedPos,
                                               size_t&    lastKnownPos )
 {

diff --git a/utils/HelpGen/src/ifcontext.h b/utils/HelpGen/src/ifcontext.h
index af0d4fc419e2520f7d7ed6800574d7aaa5f91bd3..419d7006b1d42bd09be4127694aecde5211d97d0 100644 (file)
--- a/utils/HelpGen/src/ifcontext.h
+++ b/utils/HelpGen/src/ifcontext.h
@@ -59,15 +59,16 @@ protected:
 
     void InsertBookmarkSorted( BookmarkListT& lst, spBookmark& mark );
 
-    void DoAppendSourceFragment( string& source,
-                                 string& result,
-                                 size_t  pos, size_t len );
+    void DoAppendSourceFragment( wxString& source,
+                                 wxString& result,
+                                 size_t    pos,
+                                 size_t len );
 
     void GenerateContextBody( spContext& ctx,
-                              string&    source,
-                              string&    result,
-                              size_t& lastSavedPos,
-                              size_t& lastKnownPos );
+                              wxString&  source,
+                              wxString&  result,
+                              size_t&    lastSavedPos,
+                              size_t&    lastKnownPos );
 
 public: