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

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

utils/HelpGen/src/cjparser.cpp

@@ -386,13 +386,13 @@ static inline bool get_next_token( char*& cur )
         return true;
 }
 
-static inline void skip_preprocessor_dir( char*& cur )
+static inline void skip_preprocessor_dir( wxChar*& cur )
 {
     do
     {
         skip_to_eol(cur);
 
-        if ( *(cur-1) != '\\' )
+        if ( *(cur-1) != _T('\\') )
             break;
 
         if ( cur < _gSrcEnd )
@@ -2196,10 +2196,10 @@ void CJSourceParser::AddClassNode( char*& cur )
     clear_commets_queue();
 }
 
-void CJSourceParser::AddEnumNode( char*& cur )
+void CJSourceParser::AddEnumNode( wxChar*& cur )
 {
     // now the cursor is at "enum" keyword
-    char* start = cur;
+    wxChar* start = cur;
 
     spEnumeration* pEnum = new spEnumeration();
     mpCurCtx->AddMember( pEnum );
@@ -2233,13 +2233,13 @@ void CJSourceParser::AddEnumNode( char*& cur )
     clear_commets_queue();
 }
 
-void CJSourceParser::AddTypeDefNode( char*& cur )
+void CJSourceParser::AddTypeDefNode( wxChar*& cur )
 {
     // now the cursor at the token next to "typedef" keyword
 
     if ( !get_next_token(cur) ) return;
 
-    char* start = cur;
+    wxChar* start = cur;
 
     spTypeDef* pTDef = new spTypeDef();
     mpCurCtx->AddMember( pTDef );
@@ -2253,18 +2253,18 @@ void CJSourceParser::AddTypeDefNode( char*& cur )
     int tmpLnNo;
     store_line_no( tmpLnNo );
 
-    char* tok = cur-1;
+    wxChar* tok = cur-1;
     skip_next_token_back( tok );
 
-    char* nameEnd = tok;
+    wxChar* nameEnd = tok;
 
     skip_token_back( tok );
 
-    char* nameStart = tok;
+    wxChar* nameStart = tok;
 
     skip_next_token_back( tok );
 
-    char* typeEnd = tok;
+    wxChar* typeEnd = tok;
 
     // check if it's function prototype
     if ( *nameStart == ')' )

utils/HelpGen/src/docripper.cpp

@@ -257,13 +257,13 @@ ScriptTemplate* RipperDocGen::GetRefTemplFor( spContext& ctx )
         return &mDeadRefTempl;
 }
 
-string RipperDocGen::GetScopedName( spContext& ofCtx )
+wxString RipperDocGen::GetScopedName( spContext& ofCtx )
 {
     if ( ofCtx.IsInFile() )
         return ofCtx.GetName();
     else
         return ofCtx.GetOutterContext()->GetName() +
-               "::" + ofCtx.GetName();
+               _T("::") + ofCtx.GetName();
 }
 
 void RipperDocGen::AddToCurrentClass( ScriptSection* pSection, spContext& ctx,
@@ -371,14 +371,14 @@ void RipperDocGen::VisitEnumeration( spEnumeration& en )
     if ( CheckIfUncommented( en, *mpEnumIdx ) )
         return;
 
-    string body;
+    wxString body;
     body += mTags[TAG_BOLD].start;
 
     AppendMulitilineStr( body, en.m_EnumContent );
 
     body += mTags[TAG_BOLD].end;
 
-    string line;
+    wxString line;
     AppendHighlightedSource( line, body );
     AppendComments( en, line );
 
@@ -394,7 +394,7 @@ void RipperDocGen::VisitTypeDef( spTypeDef& td )
     if ( CheckIfUncommented( td, *mpTypeDefIdx ) )
         return;
 
-    string body;
+    wxString body;
     body += mTags[TAG_BOLD].start;
     body += "typdef ";
     body += mTags[TAG_BOLD].end;
@@ -407,7 +407,7 @@ void RipperDocGen::VisitTypeDef( spTypeDef& td )
     body += td.GetName();
     body += mTags[TAG_BOLD].end;
 
-    string line;
+    wxString line;
     AppendHighlightedSource( line, body );
     AppendComments( td, line );
 
@@ -426,10 +426,10 @@ void RipperDocGen::VisitPreprocessorLine( spPreprocessorLine& pd )
     if ( CheckIfUncommented( pd, *mpMacroIdx ) )
         return;
 
-    string body;
+    wxString body;
     body += mTags[TAG_FIXED_FONT].start;
 
-    string coloredLine = pd.m_Line;
+    wxString coloredLine = pd.m_Line;
     AppendHighlightedSource( coloredLine, pd.m_Line );
 
     AppendMulitilineStr( body, coloredLine );
@@ -456,7 +456,7 @@ void RipperDocGen::VisitClass( spClass& cl )
         return;
     }
 
-    string body;
+    wxString body;
     AppendComments( cl, body );
 
     mpCurClassSect =
@@ -491,7 +491,7 @@ void RipperDocGen::VisitClass( spClass& cl )
 
 void RipperDocGen::VisitAttribute( spAttribute& attr )
 {
-    string body;
+    wxString body;
     body += mTags[TAG_BOLD].start;
     body += attr.m_Type;
     body += mTags[TAG_BOLD].end;
@@ -501,7 +501,7 @@ void RipperDocGen::VisitAttribute( spAttribute& attr )
     body += attr.GetName();
     body += mTags[TAG_ITALIC].end;
 
-    string line;
+    wxString line;
     AppendHighlightedSource( line, body );
     AppendComments( attr, line );
 
@@ -525,7 +525,7 @@ void RipperDocGen::VisitAttribute( spAttribute& attr )
 
 void RipperDocGen::VisitOperation( spOperation& op )
 {
-    string body;
+    wxString body;
 
     AppendHighlightedSource( body, op.GetFullName(mTags) );
 

utils/HelpGen/src/docripper.h

@@ -90,7 +90,7 @@ protected:
 
     void AppendHighlightedSource( string& st, string source );
 
-	// returns TRUE, if no comments found in the context,
+    // returns true, if no comments found in the context,
     // plus, creates dummy(empty) section, and puts a
     // reference woth "dead-link" template to it in the
     // given index-section "toSect"
@@ -105,7 +105,7 @@ protected:
     // adds "someClass::" perfix to the context name,
     // if it's not in the file scope (i.e. if it's not global)
 
-	string GetScopedName( spContext& ofCtx );
+    wxString GetScopedName( spContext& ofCtx );
 
     // adds section to currently assembled class section
     // and places references to it from "public", "protected"