offset version by 1 to avoid having compatibility_version of 0.0.0 under Darwin:...

[wxWidgets.git] / utils / HelpGen / src / cjparser.cpp

diff --git a/utils/HelpGen/src/cjparser.cpp b/utils/HelpGen/src/cjparser.cpp
index fbec4d74dc4604558c54bda6faa29531a17ea011..821023f397779796faef704499bf199b3762b323 100644 (file)
--- a/utils/HelpGen/src/cjparser.cpp
+++ b/utils/HelpGen/src/cjparser.cpp
@@ -6,13 +6,9 @@
 // Created:     22/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Aleskandars Gluchovas
 // Created:     22/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Aleskandars Gluchovas

-// Licence:       wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#  pragma implementation "acell.h"
-#endif
-

 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 


@@ -42,7 +38,7 @@
 // statics used by inline'ed C helper-functions
 static char* _gSrcStart = 0;
 static char* _gSrcEnd   = 0;
 // statics used by inline'ed C helper-functions
 static char* _gSrcStart = 0;
 static char* _gSrcEnd   = 0;

-static char* _gLastSuppresedComment = 0;
+static wxChar* _gLastSuppresedComment = 0;

 static int   _gLineNo      = 0;
 
 // FOR NOW:: comments queue is static
 static int   _gLineNo      = 0;
 
 // FOR NOW:: comments queue is static


@@ -161,12 +157,12 @@ static inline bool skip_to_next_comment_in_the_line( char*& cur )
                *cur != '/'
              ) ++cur;
 
                *cur != '/'
              ) ++cur;
 

-        if ( cur == _gSrcEnd ) return FALSE;
+        if ( cur == _gSrcEnd ) return false;

 
         if ( *cur == '/' )
         {
             if ( (*(cur+1) == '*') ||
 
         if ( *cur == '/' )
         {
             if ( (*(cur+1) == '*') ||

-                 (*(cur+1) == '/') ) return TRUE;
+                 (*(cur+1) == '/') ) return true;

             else
             {
                 ++cur;
             else
             {
                 ++cur;


@@ -174,7 +170,7 @@ static inline bool skip_to_next_comment_in_the_line( char*& cur )
             }
         }
 
             }
         }
 

-        return FALSE;
+        return false;

 
     } while(1);
 }
 
     } while(1);
 }


@@ -381,19 +377,18 @@ static inline bool get_next_token( char*& cur )
     }
 
     if ( cur >= _gSrcEnd )
     }
 
     if ( cur >= _gSrcEnd )

-
-        return FALSE;
+        return false;

     else
     else

-        return TRUE;
+        return true;

 }
 
 }
 

-static inline void skip_preprocessor_dir( char*& cur )
+static inline void skip_preprocessor_dir( wxChar*& cur )

 {
     do
     {
         skip_to_eol(cur);
 
 {
     do
     {
         skip_to_eol(cur);
 

-        if ( *(cur-1) != '\\' )
+        if ( *(cur-1) != _T('\\') )

             break;
 
         if ( cur < _gSrcEnd )
             break;
 
         if ( cur < _gSrcEnd )


@@ -497,13 +492,13 @@ static inline bool cmp_tokens( char* tok1, char* tok2 )
     do
     {
         if ( *(tok1++) != *(tok2++) )
     do
     {
         if ( *(tok1++) != *(tok2++) )

-            return FALSE;
+            return false;

 
         --len;
 
     } while ( --len );
 
 
         --len;
 
     } while ( --len );
 

-    return TRUE;
+    return true;

 }
 
 static inline bool cmp_tokens_fast( char* tok1, char* tok2, size_t len )
 }
 
 static inline bool cmp_tokens_fast( char* tok1, char* tok2, size_t len )


@@ -511,11 +506,11 @@ static inline bool cmp_tokens_fast( char* tok1, char* tok2, size_t len )
     do
     {
         if ( *(tok1++) != *(tok2++) )
     do
     {
         if ( *(tok1++) != *(tok2++) )

-            return FALSE;
+            return false;

 
     } while ( --len );
 
 
     } while ( --len );
 

-    return TRUE;
+    return true;

 }
 
 static inline void skip_tempalate_statement( char*& cur )
 }
 
 static inline void skip_tempalate_statement( char*& cur )


@@ -645,9 +640,9 @@ static inline void skip_next_token_back( char*& cur )
     ++cur; // position after the trailing charcter of the prev token
 }
 
     ++cur; // position after the trailing charcter of the prev token
 }
 

-static string get_token_str( char* cur )
+static wxString get_token_str( char* cur )

 {
 {

-    return string( cur, get_token_len( cur ) );
+    return wxString( cur, get_token_len( cur ) );

 }
 
 // skips token or whole expression which may have
 }
 
 // skips token or whole expression which may have


@@ -741,18 +736,18 @@ static inline bool skip_imp_block( char*& cur )
     while( *cur != '{' && cur < _gSrcEnd )
     {
         skip_token( cur );
     while( *cur != '{' && cur < _gSrcEnd )
     {
         skip_token( cur );

-        if ( !get_next_token( cur ) ) return FALSE;
+        if ( !get_next_token( cur ) ) return false;

     }
 
     while( *cur != '}' && cur < _gSrcEnd )
     {
         skip_token( cur );
     }
 
     while( *cur != '}' && cur < _gSrcEnd )
     {
         skip_token( cur );

-        if ( !get_next_token( cur ) ) return FALSE;
+        if ( !get_next_token( cur ) ) return false;

     }
 
     ++cur;
 
     }
 
     ++cur;
 

-    return TRUE;
+    return true;

 }
 
 static bool is_class_token( char*& cur )
 }
 
 static bool is_class_token( char*& cur )


@@ -779,7 +774,7 @@ static bool is_class_token( char*& cur )
 
             return cmp_tokens_fast( cur, "union", 5 );
 
 
             return cmp_tokens_fast( cur, "union", 5 );
 

-    return FALSE;
+    return false;

 }
 
 inline static bool is_forward_decl( char* cur )
 }
 
 inline static bool is_forward_decl( char* cur )


@@ -788,11 +783,11 @@ inline static bool is_forward_decl( char* cur )
     {
         switch( *cur )
         {
     {
         switch( *cur )
         {

-            case ':' : return FALSE;
-            case '{' : return FALSE;
-            case '(' : return FALSE;
+            case ':' : return false;
+            case '{' : return false;
+            case '(' : return false;

 
 

-            case ';' : return TRUE;
+            case ';' : return true;

 
             default : break;
         };
 
             default : break;
         };


@@ -801,12 +796,12 @@ inline static bool is_forward_decl( char* cur )
 
     } while (cur < _gSrcEnd); // prevent running out of bounds
 
 
     } while (cur < _gSrcEnd); // prevent running out of bounds
 

-    return FALSE;
+    return false;

 }
 
 inline static bool is_function( char* cur, bool& isAMacro )
 {
 }
 
 inline static bool is_function( char* cur, bool& isAMacro )
 {

-    isAMacro = FALSE;
+    isAMacro = false;

 
     int tmpLnNo;
     store_line_no( tmpLnNo );
 
     int tmpLnNo;
     store_line_no( tmpLnNo );


@@ -825,10 +820,10 @@ inline static bool is_function( char* cur, bool& isAMacro )
 
     if ( cur > eol )
     {
 
     if ( cur > eol )
     {

-        isAMacro = TRUE;
+        isAMacro = true;

         restore_line_no( tmpLnNo );
 
         restore_line_no( tmpLnNo );
 

-        return TRUE;
+        return true;

     }
 
     // it's not a macro, go to the begining of arg. list
     }
 
     // it's not a macro, go to the begining of arg. list


@@ -840,7 +835,7 @@ inline static bool is_function( char* cur, bool& isAMacro )
         if ( *cur == '(' )
         {
             restore_line_no( tmpLnNo );
         if ( *cur == '(' )
         {
             restore_line_no( tmpLnNo );

-            return TRUE;
+            return true;

         }
 
         // end of statement found without any brackets in it
         }
 
         // end of statement found without any brackets in it


@@ -849,7 +844,7 @@ inline static bool is_function( char* cur, bool& isAMacro )
         if ( *cur == ';' )
         {
             restore_line_no( tmpLnNo );
         if ( *cur == ';' )
         {
             restore_line_no( tmpLnNo );

-            return FALSE;
+            return false;

         }
 
         ++cur;
         }
 
         ++cur;


@@ -859,7 +854,7 @@ inline static bool is_function( char* cur, bool& isAMacro )
     isAMacro = 1;
     restore_line_no( tmpLnNo );
 
     isAMacro = 1;
     restore_line_no( tmpLnNo );
 

-    return FALSE;
+    return false;

 }
 
 // upon return the cursor is positioned after the
 }
 
 // upon return the cursor is positioned after the


@@ -899,13 +894,13 @@ static inline void skip_scope_block( char*& cur )
 // moves tokens like '*' '**', '***', '&' from the name
 // to the type
 
 // moves tokens like '*' '**', '***', '&' from the name
 // to the type
 

-static void arrange_indirection_tokens_between( string& type,
-                                                string& identifier )
+static void arrange_indirection_tokens_between( wxString& type,
+                                                wxString& identifier )

 {
     // TBD:: FIXME:: return value of operators !
 
 {
     // TBD:: FIXME:: return value of operators !
 

-    while ( identifier[0u] == '*' ||
-            identifier[0u] == '&'
+    while ( identifier[0u] == _T('*') ||
+            identifier[0u] == _T('&')

           )
     {
         type += identifier[0u];
           )
     {
         type += identifier[0u];


@@ -936,33 +931,33 @@ static bool is_keyword( char* cur )
     return i == __gMultiLangMap.end() ? false : true;
 }
 
     return i == __gMultiLangMap.end() ? false : true;
 }
 

-static inline void get_string_between( char* start, char* end,
-                                       string* pStr )
+static inline void get_string_between( wxChar* start, wxChar* end,
+                                       wxString* pStr )

 {
     char saved = *end;
 
 {
     char saved = *end;
 

-    *end  = '\0';
+    *end  = _T('\0');

     *pStr = start;
     *end  = saved;
 }
 
     *pStr = start;
     *end  = saved;
 }
 

-static char* set_comment_text( string& text, char* start )
+static wxChar* set_comment_text( wxString& text, wxChar* start )

 {
 {

-    char* end = start;
+    wxChar* end = start;

 
     // to avoid poluting the queue with this comment
     _gLastSuppresedComment = start;
 
     skip_comments( end );
 
 
     // to avoid poluting the queue with this comment
     _gLastSuppresedComment = start;
 
     skip_comments( end );
 

-    if ( *(end-1) == '/' )
+    if ( *(end-1) == _T('/') )

         end -= 2;
 
     start += 2;
 
     // skip multiple leading '/''s or '*''s
         end -= 2;
 
     start += 2;
 
     // skip multiple leading '/''s or '*''s

-    while( *start == '/' && start < end ) ++start;
-    while( *start == '*' && start < end ) ++start;
+    while( *start == _T('/') && start < end ) ++start;
+    while( *start == _T('*') && start < end ) ++start;

 
     get_string_between( start, end, &text );
 
 
     get_string_between( start, end, &text );
 


@@ -993,7 +988,7 @@ spFile* CJSourceParser::Parse( char* start, char* end )
     mIsTemplate   = 0;
     mNestingLevel = 0;
 
     mIsTemplate   = 0;
     mNestingLevel = 0;
 

-    cur = start;
+    m_cur = start;

 
     mpStart = start;
     mpEnd   = end;
 
     mpStart = start;
     mpEnd   = end;


@@ -1009,48 +1004,48 @@ spFile* CJSourceParser::Parse( char* start, char* end )
 
     do
     {
 
     do
     {

-        if ( !get_next_token( cur ) )
+        if ( !get_next_token( m_cur ) )

             // end of source reached
             return pTopCtx;
 
             // end of source reached
             return pTopCtx;
 

-        if ( memcmp( cur, "ScriptSection( const string&",
+        if ( memcmp( m_cur, "ScriptSection( const string&",

                      strlen( "ScriptSection( const string&" )
                    ) == 0
             )
         {
                      strlen( "ScriptSection( const string&" )
                    ) == 0
             )
         {

-            int o = 0;
-            ++o;
+            // int o = 0;
+            // ++o;

         }
 
         }
 

-        switch (*cur)
+        switch (*m_cur)

         {
             case '#' :
                 {
         {
             case '#' :
                 {

-                    AddMacroNode( cur );
+                    AddMacroNode( m_cur );

                     continue;
                 }
 
             case ':' :
                 {
                     continue;
                 }
 
             case ':' :
                 {

-                    skip_token( cur );
+                    skip_token( m_cur );

                     continue;
                 }
 
             case ';' :
                 {
                     continue;
                 }
 
             case ';' :
                 {

-                    skip_token( cur );
+                    skip_token( m_cur );

                     continue;
                 }
 
             case ')' :
                 {
                     continue;
                 }
 
             case ')' :
                 {

-                    skip_token( cur );
+                    skip_token( m_cur );

                     continue;
                 }
 
             case '=' :
                 {
                     continue;
                 }
 
             case '=' :
                 {

-                    skip_token( cur );
+                    skip_token( m_cur );

                     continue;
                 }
 
                     continue;
                 }
 


@@ -1058,24 +1053,24 @@ spFile* CJSourceParser::Parse( char* start, char* end )
         }
 
         // 'const' is a part of the return type, not a keyword here
         }
 
         // 'const' is a part of the return type, not a keyword here

-        if ( strncmp(cur, "const", 5) != 0 && is_keyword( cur ) )
+        if ( strncmp(m_cur, "const", 5) != 0 && is_keyword( m_cur ) )

         {
             // parses, token, if token identifies
             // the container context (e.g. class/namespace)
             // the corresponding context object is created
             // and set as current context
 
         {
             // parses, token, if token identifies
             // the container context (e.g. class/namespace)
             // the corresponding context object is created
             // and set as current context
 

-            ParseKeyword( cur );
+            ParseKeyword( m_cur );

             continue;
         }
 
             continue;
         }
 

-        if ( *cur >= '0' && *cur <= '9' )
+        if ( *m_cur >= _T('0') && *m_cur <= _T('9') )

         {
         {

-            skip_token( cur );
+            skip_token( m_cur );

             continue;
         }
 
             continue;
         }
 

-        if ( *cur == '}' )
+        if ( *m_cur == _T('}') )

         {
             if ( mCurCtxType != SP_CTX_CLASS )
             {
         {
             if ( mCurCtxType != SP_CTX_CLASS )
             {


@@ -1084,13 +1079,13 @@ spFile* CJSourceParser::Parse( char* start, char* end )
                 // DBG:: unexpected closing-bracket found
                 //ASSERT(0);
 
                 // DBG:: unexpected closing-bracket found
                 //ASSERT(0);
 

-                skip_token( cur ); // just skip it
+                skip_token( m_cur ); // just skip it

                 continue;
             }
 
             if ( mpCurCtx->GetType() == SP_CTX_CLASS )
             {
                 continue;
             }
 
             if ( mpCurCtx->GetType() == SP_CTX_CLASS )
             {

-                int curOfs = ( (cur+1) - _gSrcStart );
+                int curOfs = ( (m_cur+1) - _gSrcStart );

 
                 mpCurCtx->mContextLength = ( curOfs - mpCurCtx->mSrcOffset );
             }
 
                 mpCurCtx->mContextLength = ( curOfs - mpCurCtx->mSrcOffset );
             }


@@ -1114,38 +1109,39 @@ spFile* CJSourceParser::Parse( char* start, char* end )
                 mIsTemplate = 0;
             }
 
                 mIsTemplate = 0;
             }
 

-            skip_token( cur );
+            skip_token( m_cur );

             continue;
         }
 
             continue;
         }
 

-        bool isAMacro = 0;
+        bool isAMacro = false;

 
 

-        if ( is_function( cur, isAMacro ) )
+        if ( is_function( m_cur, isAMacro ) )

         {
             if ( isAMacro )
             {
         {
             if ( isAMacro )
             {

-                skip_token( cur );
+                skip_token( m_cur );

                 continue;
             }
 
                 continue;
             }
 

-            char* savedPos = cur;
+            char* savedPos = m_cur;

 
             int tmpLnNo;
             store_line_no( tmpLnNo );
 
             int tmpLnNo;
             store_line_no( tmpLnNo );

+            wxUnusedVar( tmpLnNo );

 
 

-            isAMacro = FALSE;
+            isAMacro = false;

 
 

-            if ( !ParseNameAndRetVal( cur, isAMacro ) )
+            if ( !ParseNameAndRetVal( m_cur, isAMacro ) )

             {
                 if ( !isAMacro )
                 {
             {
                 if ( !isAMacro )
                 {

-                    cur = savedPos;
-                    SkipFunction( cur );
+                    m_cur = savedPos;
+                    SkipFunction( m_cur );

                 }
                 continue;
             }
 
                 }
                 continue;
             }
 

-            if ( !ParseArguments( cur ) )
+            if ( !ParseArguments( m_cur ) )

             {
                 // failure while parsing arguments,
                 // remove enclosing operation context
             {
                 // failure while parsing arguments,
                 // remove enclosing operation context


@@ -1154,8 +1150,8 @@ spFile* CJSourceParser::Parse( char* start, char* end )
                 mpCurCtx = mpCurCtx->GetOutterContext();
                 mpCurCtx->RemoveChild( pFailed );
 
                 mpCurCtx = mpCurCtx->GetOutterContext();
                 mpCurCtx->RemoveChild( pFailed );
 

-                skip_to_eol( cur );
-                //cur = savedPos;
+                skip_to_eol( m_cur );
+                //m_cur = savedPos;

             }
             else
             {
             }
             else
             {


@@ -1163,7 +1159,7 @@ spFile* CJSourceParser::Parse( char* start, char* end )
 
                 clear_commets_queue();
 
 
                 clear_commets_queue();
 

-                SkipFunctionBody( cur );
+                SkipFunctionBody( m_cur );

 
                 mpCurCtx = mpCurCtx->GetOutterContext();
 
 
                 mpCurCtx = mpCurCtx->GetOutterContext();
 


@@ -1180,23 +1176,23 @@ spFile* CJSourceParser::Parse( char* start, char* end )
             {
                 // non-class members are ignored
 
             {
                 // non-class members are ignored
 

-                skip_token( cur ); // skip the end of statement
+                skip_token( m_cur ); // skip the end of statement

                 continue;
             }
 
                 continue;
             }
 

-            ParseMemberVar( cur );
+            ParseMemberVar( m_cur );

         }
 
     } while( 1 );
 }
 
         }
 
     } while( 1 );
 }
 

-void CJSourceParser::AttachComments( spContext& ctx, char* cur )
+void CJSourceParser::AttachComments( spContext& ctx, wxChar* cur )

 {
     if ( !mCommentsOn ) return;
 
     MCommentListT& lst = ctx.GetCommentList();
 
 {
     if ( !mCommentsOn ) return;
 
     MCommentListT& lst = ctx.GetCommentList();
 

-    char* prevComEnd = 0;
+    wxChar* prevComEnd = 0;

 
     int tmpLnNo;
     store_line_no( tmpLnNo );
 
     int tmpLnNo;
     store_line_no( tmpLnNo );


@@ -1209,41 +1205,39 @@ void CJSourceParser::AttachComments( spContext& ctx, char* cur )
         lst.push_back( pComment );
 
         // find the end of comment
         lst.push_back( pComment );
 
         // find the end of comment

-        char* start = _gCommentsQueue[i];
+        wxChar* start = _gCommentsQueue[i];

 
 

-        pComment->mIsMultiline = ( *(start+1) == '*' );
+        pComment->mIsMultiline = ( *(start+1) == _T('*') );

 
         // first comment in the queue and multiline
         // comments are always treated as a begining
         // of the new paragraph in the comment text
 
         if ( i == 0 )
 
         // first comment in the queue and multiline
         // comments are always treated as a begining
         // of the new paragraph in the comment text
 
         if ( i == 0 )

-
-            pComment->mStartsPar = TRUE;
-        else
-        if ( pComment->mIsMultiline )
-
-            pComment->mStartsPar = TRUE;
+        {
+            pComment->mStartsPar = true;
+        }
+        else if ( pComment->mIsMultiline )
+        {
+            pComment->mStartsPar = true;
+        }

         else
         {
             // find out wheather there is a new-line
             // between to adjecent comments
 
         else
         {
             // find out wheather there is a new-line
             // between to adjecent comments
 

-
-            char* prevLine = start;
+            wxChar* prevLine = start;

             skip_to_prev_line(prevLine);
 
             if ( prevLine >= prevComEnd )
             skip_to_prev_line(prevLine);
 
             if ( prevLine >= prevComEnd )

-
-                pComment->mStartsPar = TRUE;
+                pComment->mStartsPar = true;

             else
             else

-                pComment->mStartsPar = FALSE;
+                pComment->mStartsPar = false;

         }
 
         }
 

-        prevComEnd = set_comment_text( pComment->mText, start );
+        prevComEnd = set_comment_text( pComment->m_Text, start );

     }
 
     }
 

-

     // attach comments which are at the end of the line
     // of the given context (if any)
 
     // attach comments which are at the end of the line
     // of the given context (if any)
 


@@ -1252,10 +1246,10 @@ void CJSourceParser::AttachComments( spContext& ctx, char* cur )
         spComment* pComment = new spComment();
         lst.push_back( pComment );
 
         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->mStartsPar = 1;

-        pComment->mIsMultiline = ( *(cur+1) == '*' );
+        pComment->mIsMultiline = ( *(cur+1) == _T('*') );

 
         // mark this comment, so that it would not
         // get in the comments list of the next context
 
         // mark this comment, so that it would not
         // get in the comments list of the next context


@@ -1267,9 +1261,9 @@ void CJSourceParser::AttachComments( spContext& ctx, char* cur )
     clear_commets_queue();
 }
 
     clear_commets_queue();
 }
 

-void CJSourceParser::AddMacroNode( char*& cur )
+void CJSourceParser::AddMacroNode( wxChar*& cur )

 {
 {

-    char* start = cur;
+    wxChar* start = cur;

 
     int lineNo = get_line_no();
 
 
     int lineNo = get_line_no();
 


@@ -1285,7 +1279,7 @@ void CJSourceParser::AddMacroNode( char*& cur )
 
     AttachComments( *pPL, cur );
 
 
     AttachComments( *pPL, cur );
 

-    get_string_between( start, cur, &pPL->mLine );
+    get_string_between( start, cur, &pPL->m_Line );

 
     ++start; // skip '#'
     get_next_token( start );
 
     ++start; // skip '#'
     get_next_token( start );


@@ -1296,15 +1290,15 @@ void CJSourceParser::AddMacroNode( char*& cur )
     // determine the type exactly and assign
     // a name to the context
 
     // determine the type exactly and assign
     // a name to the context
 

-    if ( *start == 'd' )
+    if ( *start == _T('d') )

     {
     {

-        if ( cmp_tokens_fast( start, "define", 6 ) )
+        if ( cmp_tokens_fast( start, _T("define"), 6 ) )

         {
             char* tok = start+6;
 
             get_next_token( tok );
 
         {
             char* tok = start+6;
 
             get_next_token( tok );
 

-            pPL->mName = get_token_str( tok );
+            pPL->m_Name = get_token_str( tok );

 
             skip_token( tok );
             get_next_token( tok);
 
             skip_token( tok );
             get_next_token( tok);


@@ -1316,30 +1310,30 @@ void CJSourceParser::AddMacroNode( char*& cur )
                 pPL->mDefType = SP_PREP_DEF_REDEFINE_SYMBOL;
         }
     }
                 pPL->mDefType = SP_PREP_DEF_REDEFINE_SYMBOL;
         }
     }

-    else if ( *start == 'i' )
+    else if ( *start == _T('i') )

     {
     {

-        if ( cmp_tokens_fast( start, "include", 7 ) )
+        if ( cmp_tokens_fast( start, _T("include"), 7 ) )

         {
             pPL->mDefType = SP_PREP_DEF_INCLUDE_FILE;
         }
         {
             pPL->mDefType = SP_PREP_DEF_INCLUDE_FILE;
         }

-        else if ( *++start == 'f' )
+        else if ( *++start == _T('f') )

         {
             // either "#if" or "#ifdef"
             cur = start;
             skip_token( cur );
             get_next_token( cur );
 
         {
             // either "#if" or "#ifdef"
             cur = start;
             skip_token( cur );
             get_next_token( cur );
 

-            string condition = get_token_str( cur );
+            wxString condition = get_token_str( cur );

 
             // currently, everything except '0' is true
 
             // currently, everything except '0' is true

-            if ( condition == "0" ) {
+            if ( condition == _T("0") ) {

                 // skip until the following else or enif
                 while ( cur < _gSrcEnd ) {
                     skip_to_eol( cur );
                     skip_eol( cur );
 
                     get_next_token( cur );
                 // skip until the following else or enif
                 while ( cur < _gSrcEnd ) {
                     skip_to_eol( cur );
                     skip_eol( cur );
 
                     get_next_token( cur );

-                    if ( *cur++ == '#' && *cur == 'e' )
+                    if ( *cur++ == _T('#') && *cur == _T('e') )

                         break;
                 }
             }
                         break;
                 }
             }


@@ -1347,7 +1341,7 @@ void CJSourceParser::AddMacroNode( char*& cur )
             // TODO parse the condition...
         }
     }
             // TODO parse the condition...
         }
     }

-    else if ( cmp_tokens_fast( start, "else", 4 ) )
+    else if ( cmp_tokens_fast( start, _T("else"), 4 ) )

     {
         // skip until "#endif"
         while ( cur < _gSrcEnd ) {
     {
         // skip until "#endif"
         while ( cur < _gSrcEnd ) {


@@ -1355,7 +1349,7 @@ void CJSourceParser::AddMacroNode( char*& cur )
             skip_eol( cur );
 
             get_next_token( cur );
             skip_eol( cur );
 
             get_next_token( cur );

-            if ( *cur++ == '#' && cmp_tokens_fast( cur, "endif", 5 ) )
+            if ( *cur++ == _T('#') && cmp_tokens_fast( cur, "endif", 5 ) )

                 break;
         }
     }
                 break;
         }
     }


@@ -1521,7 +1515,7 @@ void CJSourceParser::ParseKeyword( char*& cur )
 
 bool CJSourceParser::ParseNameAndRetVal( char*& cur, bool& isAMacro )
 {
 
 bool CJSourceParser::ParseNameAndRetVal( char*& cur, bool& isAMacro )
 {

-    isAMacro = FALSE;
+    isAMacro = false;

 
     // FOR NOW:: all functions in the global
     //           scope are ignored
 
     // FOR NOW:: all functions in the global
     //           scope are ignored


@@ -1537,7 +1531,7 @@ bool CJSourceParser::ParseNameAndRetVal( char*& cur, bool& isAMacro )
             isVirtual = true;
 
         skip_token( cur );
             isVirtual = true;
 
         skip_token( cur );

-        if ( !get_next_token( cur ) ) return FALSE;
+        if ( !get_next_token( cur ) ) return false;

     }
 
     char* bracketPos = cur;
     }
 
     char* bracketPos = cur;


@@ -1564,9 +1558,9 @@ bool CJSourceParser::ParseNameAndRetVal( char*& cur, bool& isAMacro )
 
             mpPlugin->ParseContext( _gSrcStart, cur, _gSrcEnd, mpCurCtx );
 
 
             mpPlugin->ParseContext( _gSrcStart, cur, _gSrcEnd, mpCurCtx );
 

-            isAMacro = TRUE;
+            isAMacro = true;

 
 

-            return FALSE;
+            return false;

         }
     }
 
         }
     }
 


@@ -1576,7 +1570,7 @@ bool CJSourceParser::ParseNameAndRetVal( char*& cur, bool& isAMacro )
     pOp->mSrcOffset    = int( start - _gSrcStart );
     pOp->mHeaderLength = int( bracketPos - start );
     if ( mpCurCtx->GetContextType() == SP_CTX_CLASS )
     pOp->mSrcOffset    = int( start - _gSrcStart );
     pOp->mHeaderLength = int( bracketPos - start );
     if ( mpCurCtx->GetContextType() == SP_CTX_CLASS )

-        pOp->mScope = mpCurCtx->mName;
+        pOp->mScope = mpCurCtx->m_Name;

 
     mpCurCtx->AddMember( pOp );
     pOp->mVisibility = mCurVis;
 
     mpCurCtx->AddMember( pOp );
     pOp->mVisibility = mCurVis;


@@ -1588,31 +1582,31 @@ bool CJSourceParser::ParseNameAndRetVal( char*& cur, bool& isAMacro )
     // go backwards to method name
     skip_token_back( cur );
 
     // go backwards to method name
     skip_token_back( cur );
 

-    pOp->mName = get_token_str( cur );
+    pOp->m_Name = get_token_str( cur );

 
     // checker whether it's not an operator
 
     // checker whether it's not an operator

-    char chFirst = *pOp->mName.c_str();
+    char chFirst = *pOp->m_Name.c_str();

     if ( !isalpha(chFirst) && chFirst != '_' && chFirst != '~' ) {
         // skip 'operator'
         skip_next_token_back( cur );
         skip_token_back( cur );
 
     if ( !isalpha(chFirst) && chFirst != '_' && chFirst != '~' ) {
         // skip 'operator'
         skip_next_token_back( cur );
         skip_token_back( cur );
 

-        string lastToken = get_token_str( cur );
+        wxString lastToken = get_token_str( cur );

         if ( lastToken == "operator" ) {
         if ( lastToken == "operator" ) {

-            lastToken += pOp->mName;
-            pOp->mName = lastToken;
+            lastToken += pOp->m_Name;
+            pOp->m_Name = lastToken;

         }
         else {
             // ok, it wasn't an operator after all
             skip_token( cur );
         }
     }
         }
         else {
             // ok, it wasn't an operator after all
             skip_token( cur );
         }
     }

-    else if ( pOp->mName == "operator" ) {
+    else if ( pOp->m_Name == "operator" ) {

         skip_token( cur );
         get_next_token( cur );
         skip_token( cur );
         get_next_token( cur );

-        string oper = get_token_str( cur );
+        wxString oper = get_token_str( cur );

 
 

-        pOp->mName += oper;
+        pOp->m_Name += oper;

     }
 
     // go backwards to method return type
     }
 
     // go backwards to method return type


@@ -1620,12 +1614,16 @@ bool CJSourceParser::ParseNameAndRetVal( char*& cur, bool& isAMacro )
 
     if ( cur >= start )
     {
 
     if ( cur >= start )
     {

-        string rettype = string( start, size_t( cur-start ) );
-        rettype.Replace("WXDLLEXPORT ", ""); // FIXME just for now...
-        pOp->mRetType = rettype;
+        wxString rettype = wxString( start, size_t( cur-start ) );
+        // FIXME just for now...
+        wxString::size_type pos = 0;
+        wxString toerase("WXDLLEXPORT ");
+        while((pos = rettype.find(toerase, pos)) != wxString::npos)
+            rettype.erase(pos, toerase.length());
+        pOp->m_RetType = rettype;

     }
 
     }
 

-    arrange_indirection_tokens_between( pOp->mRetType, pOp->mName );
+    arrange_indirection_tokens_between( pOp->m_RetType, pOp->m_Name );

 
     cur = savedPos;
     restore_line_no( tmpLnNo );
 
     cur = savedPos;
     restore_line_no( tmpLnNo );


@@ -1633,7 +1631,7 @@ bool CJSourceParser::ParseNameAndRetVal( char*& cur, bool& isAMacro )
     // now, enter operation context
     mpCurCtx = pOp;
 
     // now, enter operation context
     mpCurCtx = pOp;
 

-    return TRUE;
+    return true;

 }
 
 bool CJSourceParser::ParseArguments( char*& cur )
 }
 
 bool CJSourceParser::ParseArguments( char*& cur )


@@ -1655,7 +1653,7 @@ bool CJSourceParser::ParseArguments( char*& cur )
 
         get_next_token( cur );
 
 
         get_next_token( cur );
 

-        bool first_blk = 1;
+        bool first_blk = true;

 
         while( *cur != ')' && *cur != ',' )
         {
 
         while( *cur != ')' && *cur != ',' )
         {


@@ -1693,7 +1691,7 @@ bool CJSourceParser::ParseArguments( char*& cur )
             // if only one block enclosed, than it's probably
             // some macro, there should be at least two blocks,
             // one for argument type and another for it's identifier
             // if only one block enclosed, than it's probably
             // some macro, there should be at least two blocks,
             // one for argument type and another for it's identifier

-            return FALSE;
+            return false;

         }
 
         if ( blocksSkipped == 0 )
         }
 
         if ( blocksSkipped == 0 )


@@ -1732,7 +1730,7 @@ bool CJSourceParser::ParseArguments( char*& cur )
                 continue;
             }
 
                 continue;
             }
 

-            pPar->mInitVal = string( blocks[nameBlock], blockSizes[nameBlock] );
+            pPar->m_InitVal = wxString( blocks[nameBlock], blockSizes[nameBlock] );

 
             nameBlock = nameBlock - 2; // skip '=' token and default value block
             typeBlock = nameBlock - 1;
 
             nameBlock = nameBlock - 2; // skip '=' token and default value block
             typeBlock = nameBlock - 1;


@@ -1742,16 +1740,16 @@ bool CJSourceParser::ParseArguments( char*& cur )
         AttachComments( *pPar, blocks[nameBlock] );
 
         // retrieve argument name
         AttachComments( *pPar, blocks[nameBlock] );
 
         // retrieve argument name

-        pPar->mName = string( blocks[nameBlock], blockSizes[nameBlock] );
+        pPar->m_Name = wxString( blocks[nameBlock], blockSizes[nameBlock] );

 
         // retreive argument type
 
         size_t len = blockSizes[ typeBlock ];
         len = size_t ( (blocks[ typeBlock ] + len) - blocks[ 0 ] );
 
 
         // retreive argument type
 
         size_t len = blockSizes[ typeBlock ];
         len = size_t ( (blocks[ typeBlock ] + len) - blocks[ 0 ] );
 

-        pPar->mType = string( blocks[0], len );
+        pPar->m_Type = wxString( blocks[0], len );

 
 

-        arrange_indirection_tokens_between( pPar->mType, pPar->mName );
+        arrange_indirection_tokens_between( pPar->m_Type, pPar->m_Name );

 
         if ( *cur == ')' )
         {
 
         if ( *cur == ')' )
         {


@@ -1777,29 +1775,31 @@ bool CJSourceParser::ParseArguments( char*& cur )
     int tmpLnNo;
     store_line_no( tmpLnNo );
 
     int tmpLnNo;
     store_line_no( tmpLnNo );
 

+    bool result = true;
+

     do
     {
         if ( *tok == '{' || *tok == ';' )
         {
             restore_line_no(tmpLnNo);
     do
     {
         if ( *tok == '{' || *tok == ';' )
         {
             restore_line_no(tmpLnNo);

-            return TRUE;
+            break;

         }
 
         // check for unexpected tokens
         if ( *tok == '=' || *tok == '0' )
         {
             skip_token(tok);
         }
 
         // check for unexpected tokens
         if ( *tok == '=' || *tok == '0' )
         {
             skip_token(tok);

-            if ( !get_next_token(tok) ) return FALSE;
+            if ( !get_next_token(tok) ) return false;

             continue;
         }
 
             continue;
         }
 

-        if ( *tok == '}' ) return FALSE;
+        if ( *tok == '}' ) return false;

 
         // if initialization list found
         if ( *tok == ':' )
         {
             restore_line_no(tmpLnNo);
 
         // if initialization list found
         if ( *tok == ':' )
         {
             restore_line_no(tmpLnNo);

-            return TRUE;
+            break;

         }
 
         if ( cmp_tokens_fast( tok, "const", 5 ) )
         }
 
         if ( cmp_tokens_fast( tok, "const", 5 ) )


@@ -1807,32 +1807,30 @@ bool CJSourceParser::ParseArguments( char*& cur )
             ((spOperation*)mpCurCtx)->mIsConstant = true;
 
             skip_token(tok);
             ((spOperation*)mpCurCtx)->mIsConstant = true;
 
             skip_token(tok);

-            if ( !get_next_token(tok) ) return FALSE;
+            if ( !get_next_token(tok) ) return false;

             continue;
         }
 
             continue;
         }
 

-        if ( CheckVisibilty( tok ) ) return FALSE;
+        if ( CheckVisibilty( tok ) ) return false;

 
         // if next context found
 
         // if next context found

-        if ( is_keyword( tok ) ) return FALSE;
+        if ( is_keyword( tok ) ) return false;

 
         skip_token(tok);
 
         skip_token(tok);

-        if ( !get_next_token(tok) ) return FALSE;
+        if ( !get_next_token(tok) ) return false;

 
     } while(1);
 
 
     } while(1);
 

-    return TRUE;
+    return result;

 }
 
 void CJSourceParser::ParseMemberVar( char*& cur )
 {
     MMemberListT& members = mpCurCtx->GetMembers();
 
 }
 
 void CJSourceParser::ParseMemberVar( char*& cur )
 {
     MMemberListT& members = mpCurCtx->GetMembers();
 

-    bool firstMember = 1;
+    bool firstMember = true;

 
 

-    size_t first = 0;
-
-    string type;
+    wxString type;

 
     // jump to the end of statement
     // and start collecting same-type varibles
 
     // jump to the end of statement
     // and start collecting same-type varibles


@@ -1860,7 +1858,6 @@ void CJSourceParser::ParseMemberVar( char*& cur )
         if ( firstMember )
         {
             firstMember = 0;
         if ( firstMember )
         {
             firstMember = 0;

-            first = members.size() - 1;;

         }
 
         skip_token_back( cur );
         }
 
         skip_token_back( cur );


@@ -1868,29 +1865,28 @@ void CJSourceParser::ParseMemberVar( char*& cur )
         // attach comments about the attribute
         AttachComments( *pAttr, cur );
 
         // attach comments about the attribute
         AttachComments( *pAttr, cur );
 

-        pAttr->mName = get_token_str( cur );
+        pAttr->m_Name = get_token_str( cur );

 
         // guessing that this going to be variable type
         skip_next_token_back( cur );
         skip_token_back( cur );
 
 
         // guessing that this going to be variable type
         skip_next_token_back( cur );
         skip_token_back( cur );
 

-        pAttr->mType = get_token_str( cur );
+        pAttr->m_Type = get_token_str( cur );

 
         // if comma, than variable list continues
         // otherwise the variable type reached - stop
 
 
         // if comma, than variable list continues
         // otherwise the variable type reached - stop
 

-        if ( *cur == '=' )
+        if ( *cur == _T('=') )

         {
             // yes, we've mistaken, it was not a identifier,
             // but it's default value
         {
             // yes, we've mistaken, it was not a identifier,
             // but it's default value

-            pAttr->mInitVal =
-                pAttr->mName;
+            pAttr->m_InitVal = pAttr->m_Name;

 
             // skip default value and '=' symbol
             skip_next_token_back( cur );
             skip_token_back( cur );
 
 
             // skip default value and '=' symbol
             skip_next_token_back( cur );
             skip_token_back( cur );
 

-            pAttr->mName = get_token_str( cur );
+            pAttr->m_Name = get_token_str( cur );

 
             skip_next_token_back( cur );
             skip_token_back( cur );
 
             skip_next_token_back( cur );
             skip_token_back( cur );


@@ -1904,7 +1900,7 @@ void CJSourceParser::ParseMemberVar( char*& cur )
 
     } while(1);
 
 
     } while(1);
 

-    first = 0;
+    size_t first = 0;

 
     // set up types for all collected (same-type) attributes;
     while ( first != members.size() - 1 )
 
     // set up types for all collected (same-type) attributes;
     while ( first != members.size() - 1 )


@@ -1913,12 +1909,12 @@ void CJSourceParser::ParseMemberVar( char*& cur )
         if ( !pAttr )
             continue;
 
         if ( !pAttr )
             continue;
 

-        if ( !pAttr->mType )
-            pAttr->mType = type;
+        if ( pAttr->m_Type.empty() )
+            pAttr->m_Type = type;

         pAttr->mVisibility = mCurVis;
 
         pAttr->mVisibility = mCurVis;
 

-        if ( !!pAttr->mName )
-            arrange_indirection_tokens_between( pAttr->mType, pAttr->mName );
+        if ( !pAttr->m_Name.empty() )
+            arrange_indirection_tokens_between( pAttr->m_Type, pAttr->m_Name );

     }
 
     cur = savedPos;
     }
 
     cur = savedPos;


@@ -1950,7 +1946,7 @@ void CJSourceParser::SkipFunctionBody( char*& cur )
 {
     // FIXME:: check for comments and quoted stirngs here
 
 {
     // FIXME:: check for comments and quoted stirngs here
 

-    bool hasDefinition = FALSE;
+    bool hasDefinition = false;

 
     while( *cur != '{' && *cur != ';' )
     {
 
     while( *cur != '{' && *cur != ';' )
     {


@@ -1964,7 +1960,7 @@ void CJSourceParser::SkipFunctionBody( char*& cur )
     }
     else
     {
     }
     else
     {

-        hasDefinition = TRUE;
+        hasDefinition = true;

 
         skip_scope_block( cur ); // skip the whole imp.
     }
 
         skip_scope_block( cur ); // skip the whole imp.
     }


@@ -1981,15 +1977,15 @@ void CJSourceParser::SkipFunctionBody( char*& cur )
 
         // separate scope resolution token from the name of operation
 
 
         // separate scope resolution token from the name of operation
 

-        for( size_t i = 0; i != op.mName.length(); ++i )
+        for( size_t i = 0; i != op.m_Name.length(); ++i )

         {
         {

-            if ( op.mName[i] == ':' && op.mName[i+1] == ':' )
+            if ( op.m_Name[i] == ':' && op.m_Name[i+1] == ':' )

             {
             {

-                string unscoped( op.mName, i+2, op.mName.length() - ( i + 2 ) );
+                wxString unscoped( op.m_Name, i+2, op.m_Name.length() - ( i + 2 ) );

 
 

-                op.mScope = string( op.mName, 0, i );
+                op.mScope = wxString( op.m_Name, 0, i );

 
 

-                op.mName = unscoped;
+                op.m_Name = unscoped;

 
                 break;
             }
 
                 break;
             }


@@ -2004,29 +2000,29 @@ bool CJSourceParser::CheckVisibilty( char*& cur )
     if ( cmp_tokens_fast( cur, "public:", len ) )
     {
         mCurVis = SP_VIS_PUBLIC;
     if ( cmp_tokens_fast( cur, "public:", len ) )
     {
         mCurVis = SP_VIS_PUBLIC;

-        return TRUE;
+        return true;

     }
 
     if ( cmp_tokens_fast( cur, "protected:", len ) )
     {
         mCurVis = SP_VIS_PROTECTED;
     }
 
     if ( cmp_tokens_fast( cur, "protected:", len ) )
     {
         mCurVis = SP_VIS_PROTECTED;

-        return TRUE;
+        return true;

     }
 
     if ( cmp_tokens_fast( cur, "private:", len ) )
     {
         mCurVis = SP_VIS_PRIVATE;
     }
 
     if ( cmp_tokens_fast( cur, "private:", len ) )
     {
         mCurVis = SP_VIS_PRIVATE;

-        return TRUE;
+        return true;

     }
 
     }
 

-    return FALSE;
+    return false;

 }
 
 void CJSourceParser::AddClassNode( char*& cur )
 {
     char* ctxStart = cur;
 
 }
 
 void CJSourceParser::AddClassNode( char*& cur )
 {
     char* ctxStart = cur;
 

-    string classkeyword = get_token_str( cur );
+    wxString classkeyword = get_token_str( cur );

 
     skip_token( cur ); // skip 'class' keyword
     if ( !get_next_token( cur ) ) return;
 
     skip_token( cur ); // skip 'class' keyword
     if ( !get_next_token( cur ) ) return;


@@ -2072,7 +2068,7 @@ void CJSourceParser::AddClassNode( char*& cur )
     pClass->mSrcOffset = int( ctxStart - _gSrcStart );
 
     char* nameTok = cur;
     pClass->mSrcOffset = int( ctxStart - _gSrcStart );
 
     char* nameTok = cur;

-    pClass->mName = get_token_str( cur );
+    pClass->m_Name = get_token_str( cur );

 
     bool isDerived = 0;
 
 
     bool isDerived = 0;
 


@@ -2103,7 +2099,7 @@ void CJSourceParser::AddClassNode( char*& cur )
 
             if ( nameTok != tok )
             {
 
             if ( nameTok != tok )
             {

-                pClass->mName = get_token_str( tok );
+                pClass->m_Name = get_token_str( tok );

             }
 
         }
             }
 
         }


@@ -2156,7 +2152,7 @@ void CJSourceParser::AddClassNode( char*& cur )
 
         if ( *tok != ':' && *cur != ':' )
 
 
         if ( *tok != ':' && *cur != ':' )
 

-            pClass->mSuperClassNames.push_back( string( cur, len ) );
+            pClass->m_SuperClassNames.push_back( wxString( cur, len ) );

 
     } while(1);
 
 
     } while(1);
 


@@ -2165,9 +2161,9 @@ void CJSourceParser::AddClassNode( char*& cur )
         int tmpLn;
         store_line_no( tmpLn );
 
         int tmpLn;
         store_line_no( tmpLn );
 

-        while ( pClass->mSuperClassNames.size() )
+        while ( pClass->m_SuperClassNames.size() )

 
 

-            pClass->mSuperClassNames.erase( &pClass->mSuperClassNames[0] );
+            pClass->m_SuperClassNames.erase( &pClass->m_SuperClassNames[0] );

 
         char* tok = cur;
 
 
         char* tok = cur;
 


@@ -2177,7 +2173,7 @@ void CJSourceParser::AddClassNode( char*& cur )
         skip_next_token_back( tok );
         skip_token_back( tok );
 
         skip_next_token_back( tok );
         skip_token_back( tok );
 

-        pClass->mName = get_token_str( tok );
+        pClass->m_Name = get_token_str( tok );

 
         restore_line_no( tmpLn );
     }
 
         restore_line_no( tmpLn );
     }


@@ -2193,10 +2189,10 @@ void CJSourceParser::AddClassNode( char*& cur )
     clear_commets_queue();
 }
 
     clear_commets_queue();
 }
 

-void CJSourceParser::AddEnumNode( char*& cur )
+void CJSourceParser::AddEnumNode( wxChar*& cur )

 {
     // now the cursor is at "enum" keyword
 {
     // now the cursor is at "enum" keyword

-    char* start = cur;
+    wxChar* start = cur;

 
     spEnumeration* pEnum = new spEnumeration();
     mpCurCtx->AddMember( pEnum );
 
     spEnumeration* pEnum = new spEnumeration();
     mpCurCtx->AddMember( pEnum );


@@ -2212,31 +2208,31 @@ void CJSourceParser::AddEnumNode( char*& cur )
     // check if enumeration has got it's identifier
     if ( *cur != '{' )
     {
     // check if enumeration has got it's identifier
     if ( *cur != '{' )
     {

-        pEnum->mName = get_token_str( cur );
+        pEnum->m_Name = get_token_str( cur );

     }
 
     if ( !skip_imp_block( cur ) ) return;
 
     }
 
     if ( !skip_imp_block( cur ) ) return;
 

-    get_string_between( start, cur, &pEnum->mEnumContent );
+    get_string_between( start, cur, &pEnum->m_EnumContent );

 
     if ( get_next_token(cur) )
     {
         // check if the identifier if after the {...} block
         if ( *cur != ';' )
 
 
     if ( get_next_token(cur) )
     {
         // check if the identifier if after the {...} block
         if ( *cur != ';' )
 

-            pEnum->mName = get_token_str( cur );
+            pEnum->m_Name = get_token_str( cur );

     }
 
     clear_commets_queue();
 }
 
     }
 
     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;
 
 {
     // 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 );
 
     spTypeDef* pTDef = new spTypeDef();
     mpCurCtx->AddMember( pTDef );


@@ -2250,18 +2246,18 @@ void CJSourceParser::AddTypeDefNode( char*& cur )
     int tmpLnNo;
     store_line_no( tmpLnNo );
 
     int tmpLnNo;
     store_line_no( tmpLnNo );
 

-    char* tok = cur-1;
+    wxChar* tok = cur-1;

     skip_next_token_back( tok );
 
     skip_next_token_back( tok );
 

-    char* nameEnd = tok;
+    wxChar* nameEnd = tok;

 
     skip_token_back( tok );
 
 
     skip_token_back( tok );
 

-    char* nameStart = tok;
+    wxChar* nameStart = tok;

 
     skip_next_token_back( tok );
 
 
     skip_next_token_back( tok );
 

-    char* typeEnd = tok;
+    wxChar* typeEnd = tok;

 
     // check if it's function prototype
     if ( *nameStart == ')' )
 
     // check if it's function prototype
     if ( *nameStart == ')' )


@@ -2283,9 +2279,9 @@ void CJSourceParser::AddTypeDefNode( char*& cur )
         if ( *nameStart == '*' ) ++nameStart;
     }
 
         if ( *nameStart == '*' ) ++nameStart;
     }
 

-    get_string_between( start, typeEnd, &pTDef->mOriginalType );
+    get_string_between( start, typeEnd, &pTDef->m_OriginalType );

 
 

-    get_string_between( nameStart, nameEnd, &pTDef->mName );
+    get_string_between( nameStart, nameEnd, &pTDef->m_Name );

 
     clear_commets_queue();
 
 
     clear_commets_queue();