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

diff --git a/utils/HelpGen/src/scriptbinder.cpp b/utils/HelpGen/src/scriptbinder.cpp
index b9c79ba841f6f858a9b138be4315ece9beebef63..6559328e8d4837b9ed908407d68ec15ebb1805c1 100644 (file)
--- 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;
 
 
 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,
                               ScriptTemplate* pSectionTemplate,
                               ScriptTemplate* pReferenceTemplate,
                               bool            autoHide,


@@ -342,8 +342,8 @@ ScriptSection::ScriptSection( const string&   name,
 {
     // generate GUID
 
 {
     // generate GUID
 

-    char buf[32];
-    sprintf( buf, "%d", ++mIdCounter );
+    wxChar buf[32];
+    wxSprintf( buf, _T("%d"), ++mIdCounter );

     mId = buf;
 }
 
     mId = buf;
 }
 

diff --git a/utils/HelpGen/src/scriptbinder.h b/utils/HelpGen/src/scriptbinder.h
index 904cb3306b6e63b50f6d9e8bbc06a4666eba9b01..145082967e7fb5e9cb54d651c5d83b2bad5c8222 100644 (file)
--- 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).
 
     // 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,
                    ScriptTemplate* pSectionTemplate   = NULL,
                    ScriptTemplate* pReferenceTemplate = NULL,
                    bool            autoHide           = false,