From 7942245db005b61db34729c73e641211343b3237 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Tue, 31 May 2005 19:03:56 +0000 Subject: [PATCH 1/1] 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 --- utils/HelpGen/src/ifcontext.cpp | 8 ++++---- utils/HelpGen/src/ifcontext.h | 15 ++++++++------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/utils/HelpGen/src/ifcontext.cpp b/utils/HelpGen/src/ifcontext.cpp index 01488de4db..1c5a41a163 100644 --- 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 af0d4fc419..419d7006b1 100644 --- 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: -- 2.45.2