Added wxToolbook class

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

diff --git a/utils/HelpGen/src/cjparser.h b/utils/HelpGen/src/cjparser.h
index 384b2b147f462e5b4fe79d0e748b5e6ceff2a6d2..0151775c433f0fdb01162898d27f773901878f65 100644 (file)
--- a/utils/HelpGen/src/cjparser.h
+++ b/utils/HelpGen/src/cjparser.h
@@ -15,11 +15,16 @@
 
 #include "srcparser.h"
 
-#include <iostream.h>
 #include <memory.h>
 #include <stdlib.h>
 #include <stdio.h>
 
+#if wxUSE_IOSTREAMH
+    #include <iostream.h>
+#else
+    #include <iostream>
+#endif
+
 // class parses given "memory-resident" Java or C++ source code
 // and captures information about classes/attrubutes/methods/
 // arguments/etc into structures. Conforms with SourceParserBase
@@ -29,17 +34,17 @@ class CJSourceParser : public SourceParserBase
 {
 protected:
     // begining of the full-text area of the source file
-    char* mpStart;
+    wxChar* mpStart;
 
     // points to first character after the end
     // of teh full-text area
-    char* mpEnd;
+    wxChar* mpEnd;
 
     // current "privacy level"
     int   mCurVis;
 
     // current parsing position int full-text area
-    char*  cur;
+    wxChar*  m_cur;
 
     // about the current class
     bool   mIsVirtual;
@@ -70,9 +75,9 @@ protected:
     void AddEnumNode( char*& cur );
     void AddTypeDefNode( char*& cur );
 
-    void DumpOperationInfo( spOperation& info, const string& tab, ostream& os );
-    void DumpClassHeader( spClass& info, ostream& os );
-    void DumpClassBody( spClass& info, ostream& os );
+    void DumpOperationInfo( spOperation& info, const wxString& tab, wxSTD ostream& os );
+    void DumpClassHeader( spClass& info, wxSTD ostream& os );
+    void DumpClassBody( spClass& info, wxSTD ostream& os );
 
 public:
 
@@ -109,17 +114,17 @@ static inline void skip_tempalate_statement( char*& cur );
 static inline void skip_statement( char*& cur );
 static inline void skip_token_back( char*& cur );
 static inline void skip_next_token_back( char*& cur );
-static string get_token_str( char* cur );
+static wxString get_token_str( char* cur );
 static size_t skip_block( char*& cur );
 static inline bool skip_imp_block( char*& cur );
 static bool is_class_token( char*& cur );
 inline static bool is_forward_decl( char* cur );
 inline static bool is_function( char* cur, bool& isAMacro );
 static inline void skip_scope_block( char*& cur );
-static void arrange_indirection_tokens_between( string& type, string& identifier );
+static void arrange_indirection_tokens_between( wxString& type, wxString& identifier );
 static bool is_keyword( char* cur );
-static inline void get_string_between( char* start, char* end, string* pStr );
-static char* set_comment_text( string& text, char* start );
+static inline void get_string_between( char* start, char* end, wxString* pStr );
+static char* set_comment_text( wxString& text, char* start );
 */
 
 #endif