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

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

diff --git a/utils/HelpGen/src/HelpGen.cpp b/utils/HelpGen/src/HelpGen.cpp
index caa4b15f159645a561592a73167f49e2484ec396..b32b313cdb864bbe4c6c7d79540abfce299dde61 100644 (file)
--- a/utils/HelpGen/src/HelpGen.cpp
+++ b/utils/HelpGen/src/HelpGen.cpp
@@ -1685,7 +1685,8 @@ bool DocManager::ParseTeXFile(const wxString& filename)
             constStr = _T(" const");
 
         wxLogVerbose("file %s(%d): found '%s %s::%s(%s)%s'",
-                     m_filename.c_str(), m_line,
+                     m_filename.c_str(),
+                     (int)m_line,
                      returnType.c_str(),
                      classname.c_str(),
                      funcName.c_str(),
@@ -2196,6 +2197,9 @@ static const wxString GetVersionString()
 
 /*
    $Log$
+   Revision 1.40  2005/05/30 11:49:32  ABX
+   More warning and error fixes (work in progress with Tinderbox).
+
    Revision 1.39  2005/05/30 09:26:42  ABX
    More warning and error fixes (work in progress with Tinderbox).
 

diff --git a/utils/HelpGen/src/cjparser.cpp b/utils/HelpGen/src/cjparser.cpp
index e2fae6702db75c48186e47866179c8431ea4fb74..aa451092667f1fa93db779d5d3378f6fcd1f42a0 100644 (file)
--- a/utils/HelpGen/src/cjparser.cpp
+++ b/utils/HelpGen/src/cjparser.cpp
@@ -1190,7 +1190,7 @@ spFile* CJSourceParser::Parse( char* start, char* end )
     } while( 1 );
 }
 
-void CJSourceParser::AttachComments( spContext& ctx, char* cur )
+void CJSourceParser::AttachComments( spContext& ctx, wxChar* cur )
 {
     if ( !mCommentsOn ) return;
 
@@ -1240,7 +1240,7 @@ void CJSourceParser::AttachComments( spContext& ctx, char* cur )
                 pComment->mStartsPar = false;
         }
 
-        prevComEnd = set_comment_text( pComment->mText, start );
+        prevComEnd = set_comment_text( pComment->m_Text, start );
     }
 
 
@@ -1252,7 +1252,7 @@ void CJSourceParser::AttachComments( spContext& ctx, char* cur )
         spComment* pComment = new spComment();
         lst.push_back( pComment );
 
-        set_comment_text( pComment->mText, cur );
+        set_comment_text( pComment->m_Text, cur );
 
         pComment->mStartsPar = 1;
         pComment->mIsMultiline = ( *(cur+1) == '*' );

diff --git a/utils/HelpGen/src/docripper.cpp b/utils/HelpGen/src/docripper.cpp
index 7ecb44cf8860792d4732c2e1e6e80a24fcbe1a8f..fe2c44dff8a14a9a412ee577c0ab37b176823436 100644 (file)
--- a/utils/HelpGen/src/docripper.cpp
+++ b/utils/HelpGen/src/docripper.cpp
@@ -185,7 +185,7 @@ void RipperDocGen::AppendComments( spContext& fromContext, string& str )
                 str += mTags[TAG_PARAGRAPH].start;
             }
 
-        str += lst[i]->mText;
+        str += lst[i]->m_Text;
     }
 
     // remove new lines, and insert paragraph breaks

diff --git a/utils/HelpGen/src/srcparser.cpp b/utils/HelpGen/src/srcparser.cpp
index d9d4468ce6382cfe8caae6c8bb87c22666e2228e..de9e54183e19dc30c01ca0ac377522cbbb30ddce 100644 (file)
--- a/utils/HelpGen/src/srcparser.cpp
+++ b/utils/HelpGen/src/srcparser.cpp
@@ -109,14 +109,14 @@ bool spComment::StartsParagraph() const
     return mStartsPar;
 }
 
-string& spComment::GetText()
+wxString& spComment::GetText()
 {
-    return mText;
+    return m_Text;
 }
 
-string spComment::GetText() const
+wxString spComment::GetText() const
 {
-    return mText;
+    return m_Text;
 }
 
 /***** Implementation for class spContext *****/

diff --git a/utils/HelpGen/src/srcparser.h b/utils/HelpGen/src/srcparser.h
index 54ced62df44123609a7a790f36f6d5191c93f0c0..77cfbe2a60dc499f038f0b68b2e00f767fee4051 100644 (file)
--- a/utils/HelpGen/src/srcparser.h
+++ b/utils/HelpGen/src/srcparser.h
@@ -233,23 +233,23 @@ public:
 class spComment
 {
 public:
-    string mText;
-    bool   mIsMultiline; // multiline comments ar those with /**/'s
+    wxString m_Text;
+    bool     mIsMultiline; // multiline comments ar those with /**/'s
 
     // true, if these was an empty empty
     // line above single line comment
 
-    bool   mStartsPar;
+    bool     mStartsPar;
 
 public:
 
-    bool    IsMultiline() const;
-    bool    StartsParagraph() const;
+    bool     IsMultiline() const;
+    bool     StartsParagraph() const;
 
-    string& GetText();
+    string&  GetText();
 
     // contstant version of GetText()
-    string  GetText() const;
+    string   GetText() const;
 };
 
 // abstract base class for common (to most languages) code