From c826f37130fba8901ec2d8f0f73f65d2df1edba1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Mon, 30 May 2005 17:01:56 +0000 Subject: [PATCH] More warning and error fixes (work in progress with Tinderbox). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34420 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- utils/HelpGen/src/scriptbinder.cpp | 8 ++++---- utils/HelpGen/src/scriptbinder.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/utils/HelpGen/src/scriptbinder.cpp b/utils/HelpGen/src/scriptbinder.cpp index b9c79ba841..6559328e8d 100644 --- a/utils/HelpGen/src/scriptbinder.cpp +++ b/utils/HelpGen/src/scriptbinder.cpp @@ -319,8 +319,8 @@ void ScriptTemplate::PrintScript( void* dataObj, ScriptStream& stm ) int ScriptSection::mIdCounter = 0; -ScriptSection::ScriptSection( const string& name, - const string& body, +ScriptSection::ScriptSection( const wxString& name, + const wxString& body, ScriptTemplate* pSectionTemplate, ScriptTemplate* pReferenceTemplate, bool autoHide, @@ -342,8 +342,8 @@ ScriptSection::ScriptSection( const string& name, { // generate GUID - char buf[32]; - sprintf( buf, "%d", ++mIdCounter ); + wxChar buf[32]; + wxSprintf( buf, _T("%d"), ++mIdCounter ); mId = buf; } diff --git a/utils/HelpGen/src/scriptbinder.h b/utils/HelpGen/src/scriptbinder.h index 904cb3306b..145082967e 100644 --- a/utils/HelpGen/src/scriptbinder.h +++ b/utils/HelpGen/src/scriptbinder.h @@ -262,8 +262,8 @@ public: // to other sections (e.g. could be usefull for autoamically // hiding empty index-sections). - ScriptSection( const string& name = "", - const string& body = "", + ScriptSection( const wxString& name = wxEmptyString, + const wxString& body = wxEmptyString, ScriptTemplate* pSectionTemplate = NULL, ScriptTemplate* pReferenceTemplate = NULL, bool autoHide = false, -- 2.47.2