wxCocoa build fix. Use XPM everywhere.

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

diff --git a/utils/HelpGen/src/srcparser.h b/utils/HelpGen/src/srcparser.h
index e92a10be33024ef1054bc1d77fd9edea2c35f27c..bba490c7afba39d76c3f15fa732af1166c9e9698 100644 (file)
--- a/utils/HelpGen/src/srcparser.h
+++ b/utils/HelpGen/src/srcparser.h
@@ -30,9 +30,12 @@
     #include "wx/string.h"
     #include "wxstlvec.h"
 
     #include "wx/string.h"
     #include "wxstlvec.h"
 

-    // FOR NOW:: quick n' dirty:
-
-    #define  string wxString
+    #if wxUSE_STD_STRING
+        using std::string;
+    #else
+        // FOR NOW:: quick n' dirty:
+        #define  string wxString
+    #endif

 
 #endif
 
 
 #endif
 


@@ -142,7 +145,7 @@ class spComment;
     typedef WXSTL_VECTOR_SHALLOW_COPY(spParameterPtrT) MParamListT;
     typedef WXSTL_VECTOR_SHALLOW_COPY(string)          StrListT;
 
     typedef WXSTL_VECTOR_SHALLOW_COPY(spParameterPtrT) MParamListT;
     typedef WXSTL_VECTOR_SHALLOW_COPY(string)          StrListT;
 

-#endif;
+#endif

 // base class for all visitors of source code contents
 
 class spVisitor
 // base class for all visitors of source code contents
 
 class spVisitor


@@ -163,7 +166,7 @@ public:
     // spClass on sorting the class members
 
     void VisitAll( spContext& atContext,
     // spClass on sorting the class members
 
     void VisitAll( spContext& atContext,

-                   bool sortContent = TRUE
+                   bool sortContent = true

                  );
 
     // methods invoked by visitor
                  );
 
     // methods invoked by visitor


@@ -202,25 +205,25 @@ public:
     //        multiple times by variouse visitors (there can
     //        be more the one visitor visiting content at a time)
 
     //        multiple times by variouse visitors (there can
     //        be more the one visitor visiting content at a time)
 

-    virtual void VisitFile( spFile& fl ) {}
+    virtual void VisitFile( spFile& WXUNUSED(fl) ) {}

 
 

-    virtual void VisitNameSpace( spNameSpace& ns ) {}
+    virtual void VisitNameSpace( spNameSpace& WXUNUSED(ns) ) {}

 
 

-    virtual void VisitClass( spClass& cl ) {}
+    virtual void VisitClass( spClass& WXUNUSED(cl) ) {}

 
 

-    virtual void VisitEnumeration( spEnumeration& en ) {}
+    virtual void VisitEnumeration( spEnumeration& WXUNUSED(en) ) {}

 
 

-    virtual void VisitTypeDef( spTypeDef& td ) {}
+    virtual void VisitTypeDef( spTypeDef& WXUNUSED(td) ) {}

 
 

-    virtual void VisitPreprocessorLine( spPreprocessorLine& pd ) {}
+    virtual void VisitPreprocessorLine( spPreprocessorLine& WXUNUSED(pd) ) {}

 
 

-    virtual void VisitAttribute( spAttribute& attr ) {}
+    virtual void VisitAttribute( spAttribute& WXUNUSED(attr) ) {}

 
 

-    virtual void VisitOperation( spOperation& op ) {}
+    virtual void VisitOperation( spOperation& WXUNUSED(op) ) {}

 
 

-    virtual void VisitParameter( spParameter& param ) {}
+    virtual void VisitParameter( spParameter& WXUNUSED(param) ) {}

 
 

-    virtual void VisitCustomContext( spContext& ctx ) {}
+    virtual void VisitCustomContext( spContext& WXUNUSED(ctx) ) {}

 };
 
 // stores one section of comments,
 };
 
 // stores one section of comments,


@@ -233,7 +236,7 @@ public:
     string mText;
     bool   mIsMultiline; // multiline comments ar those with /**/'s
 
     string mText;
     bool   mIsMultiline; // multiline comments ar those with /**/'s
 

-    // TRUE, if these was an empty empty
+    // true, if these was an empty empty

     // line above single line comment
 
     bool   mStartsPar;
     // line above single line comment
 
     bool   mStartsPar;


@@ -308,13 +311,13 @@ public:
     // see SRC_VISIBLITY_TYPES enumeration
     int           mVisibility;
 
     // see SRC_VISIBLITY_TYPES enumeration
     int           mVisibility;
 

-    // TRUE, if context does not really exist in the source
+    // true, if context does not really exist in the source

     //       but was created by external tools (e.g. forward engineering)
 
     bool         mIsVirtualContext;
     bool         mVirtualContextHasChildren;
 
     //       but was created by external tools (e.g. forward engineering)
 
     bool         mIsVirtualContext;
     bool         mVirtualContextHasChildren;
 

-    // body of the context in case (mIsVirtual == TRUE)
+    // body of the context in case (mIsVirtual == true)

     string       mVirtualContextBody;
     string       mVittualContextFooter;
 
     string       mVirtualContextBody;
     string       mVittualContextFooter;
 


@@ -324,7 +327,7 @@ public:
 
 public:
     // universal identifier of the context (e.g. class name)
 
 public:
     // universal identifier of the context (e.g. class name)

-    string        mName;
+    wxString      m_Name;

 
 public:
     // default constructor
 
 public:
     // default constructor


@@ -357,8 +360,8 @@ public:
     bool VitualContextHasChildren();
 
     void SetVirtualContextBody( const string& body,
     bool VitualContextHasChildren();
 
     void SetVirtualContextBody( const string& body,

-                                bool  hasChildren = FALSE,
-                                const string& footer = "" );
+                                bool  hasChildren = false,
+                                const string& footer = wxEmptyString );

 
     string GetVirtualContextBody();
     string GetFooterOfVirtualContextBody();
 
     string GetVirtualContextBody();
     string GetFooterOfVirtualContextBody();


@@ -370,7 +373,7 @@ public:
 
     virtual string GetHeader( spContext* pCtx = NULL );
 
 
     virtual string GetHeader( spContext* pCtx = NULL );
 

-    // TRUE, if there is at least one entry
+    // true, if there is at least one entry

     // in the comment list of this context
     bool HasComments();
     MCommentListT& GetCommentList() { return mComments; }
     // in the comment list of this context
     bool HasComments();
     MCommentListT& GetCommentList() { return mComments; }


@@ -381,7 +384,7 @@ public:
     virtual void SortMembers() {}
 
     // returns identifier of this context
     virtual void SortMembers() {}
 
     // returns identifier of this context

-    inline string& GetName() { return mName; }
+    inline wxString& GetName() { return m_Name; }

 
     // returns -1, if souce line # is unknow
     inline int GetSourceLineNo() { return mSrcLineNo; }
 
     // returns -1, if souce line # is unknow
     inline int GetSourceLineNo() { return mSrcLineNo; }


@@ -410,11 +413,11 @@ public:
     // returns NULL, if the context with the given
     // name and type is not contained by this context
     // and it's children. Children's children are not
     // returns NULL, if the context with the given
     // name and type is not contained by this context
     // and it's children. Children's children are not

-    // searched recursivelly if searchSubMembers is FALSE
+    // searched recursivelly if searchSubMembers is false

 
     spContext* FindContext( const string& identifier,
                             int   contextType      = SP_CTX_ANY,
 
     spContext* FindContext( const string& identifier,
                             int   contextType      = SP_CTX_ANY,

-                            bool  searchSubMembers = TRUE
+                            bool  searchSubMembers = true

                           );
 
     // removes this context from it's parent
                           );
 
     // removes this context from it's parent


@@ -423,19 +426,19 @@ public:
     //  will result assertion failure)
     void RemoveThisContext();
 
     //  will result assertion failure)
     void RemoveThisContext();
 

-    // returns TRUE, if this object is aggregated in the file
+    // returns true, if this object is aggregated in the file

     bool IsInFile();
 
     bool IsInFile();
 

-    // TRUE, if outter context is a namespace
+    // true, if outter context is a namespace

     bool IsInNameSpace();
 
     bool IsInNameSpace();
 

-    // TRUE, if outter context is a class
+    // true, if outter context is a class

     bool IsInClass();
 
     bool IsInClass();
 

-    // TRUE, if outter cotext is an operation (TRUE for "spParameter"s)
+    // true, if outter cotext is an operation (true for "spParameter"s)

     bool IsInOperation();
 
     bool IsInOperation();
 

-    // TRUE if the context is public
+    // true if the context is public

     bool IsPublic() const { return mVisibility == SP_VIS_PUBLIC; }
 
     // NOTE:: method returns not the type of this object
     bool IsPublic() const { return mVisibility == SP_VIS_PUBLIC; }
 
     // NOTE:: method returns not the type of this object


@@ -544,14 +547,14 @@ public:
     // argument list
     //MParamListT mParams;
 
     // argument list
     //MParamListT mParams;
 

-    // TRUE, if operation does not modify
+    // true, if operation does not modify

     // the content of the object
     bool        mIsConstant;
 
     // flag, specific to C++
     bool        mIsVirtual;
 
     // the content of the object
     bool        mIsConstant;
 
     // flag, specific to C++
     bool        mIsVirtual;
 

-    // TRUE, if definition follows the declaration immediatelly
+    // true, if definition follows the declaration immediatelly

     bool        mHasDefinition;
 
     // scope if any (e.g. MyClass::MyFunction(), scope stirng is "MyClass" )
     bool        mHasDefinition;
 
     // scope if any (e.g. MyClass::MyFunction(), scope stirng is "MyClass" )


@@ -631,7 +634,7 @@ public:
     // valid if mClassSubType is SP_CLTYPE_TEMPLATE_CLASS
     string       mTemplateTypes;
 
     // valid if mClassSubType is SP_CLTYPE_TEMPLATE_CLASS
     string       mTemplateTypes;
 

-    // TRUE, if it's and interface of abstract base class
+    // true, if it's and interface of abstract base class

     bool         mIsAbstract;
 
 public:
     bool         mIsAbstract;
 
 public: