From 16a0cc1dad0bf9124d7ebc537f914c9db8ad420c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?W=C5=82odzimierz=20Skiba?= Date: Tue, 31 May 2005 11:07:52 +0000 Subject: [PATCH] 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 --- utils/HelpGen/src/docripper.cpp | 8 ++++---- utils/HelpGen/src/docripper.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/utils/HelpGen/src/docripper.cpp b/utils/HelpGen/src/docripper.cpp index 738d01a05b..219b65b8f1 100644 --- 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, "

" ); // FIXME:: quick-hack + str.insert( n + 1, _T("

") ); // 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 b4a5c7b7f8..0cba6c0be7 100644 --- 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