don't blit too much when copying static box border in OnPaint()

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

diff --git a/utils/HelpGen/src/srcparser.h b/utils/HelpGen/src/srcparser.h
index 33b59ec2afc0b50f4b5c0a84468f87f547edf10e..65ceb694b3358bf186d68efdcf5f4f73c90c4d76 100644 (file)
--- a/utils/HelpGen/src/srcparser.h
+++ b/utils/HelpGen/src/srcparser.h
@@ -30,13 +30,6 @@
     #include "wx/string.h"
     #include "wxstlvec.h"
 
     #include "wx/string.h"
     #include "wxstlvec.h"
 

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

 #endif
 
 #include "markup.h" // markup tags used in spOperator::GetFullName()
 #endif
 
 #include "markup.h" // markup tags used in spOperator::GetFullName()


@@ -132,7 +125,7 @@ class spComment;
     typedef vector<spComment*> MCommentListT;
     // list of parameters
     typedef vector<spParameter*> MParamListT;
     typedef vector<spComment*> MCommentListT;
     // list of parameters
     typedef vector<spParameter*> MParamListT;

-    // string list
+    // wxString list

     typedef vector<wxString>   StrListT;
 
 #else
     typedef vector<wxString>   StrListT;
 
 #else


@@ -224,6 +217,8 @@ public:
     virtual void VisitParameter( spParameter& WXUNUSED(param) ) {}
 
     virtual void VisitCustomContext( spContext& WXUNUSED(ctx) ) {}
     virtual void VisitParameter( spParameter& WXUNUSED(param) ) {}
 
     virtual void VisitCustomContext( spContext& WXUNUSED(ctx) ) {}

+
+    virtual ~spVisitor() { }

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


@@ -266,7 +261,7 @@ protected:
     MMemberListT   mMembers;
 
     // NULL, if this is top-most context
     MMemberListT   mMembers;
 
     // NULL, if this is top-most context

-    spContext*    mpParent;
+    spContext*    m_pParent;

 
     // points to context object, where the this context
     // was originally declared, meaning that this object
 
     // points to context object, where the this context
     // was originally declared, meaning that this object


@@ -318,8 +313,8 @@ public:
     bool         mVirtualContextHasChildren;
 
     // body of the context in case (mIsVirtual == true)
     bool         mVirtualContextHasChildren;
 
     // body of the context in case (mIsVirtual == true)

-    string       mVirtualContextBody;
-    string       mVittualContextFooter;
+    wxString     mVirtualContextBody;
+    wxString     mVittualContextFooter;

 
     // e.g. can be used by documentation generator to store
     // reference to section object
 
     // e.g. can be used by documentation generator to store
     // reference to section object


@@ -359,12 +354,12 @@ public:
 
     bool VitualContextHasChildren();
 
 
     bool VitualContextHasChildren();
 

-    void SetVirtualContextBody( const string& body,
+    void SetVirtualContextBody( const wxString& body,

                                 bool  hasChildren = false,
                                 bool  hasChildren = false,

-                                const string& footer = wxEmptyString );
+                                const wxString& footer = wxEmptyString );

 
 

-    string GetVirtualContextBody();
-    string GetFooterOfVirtualContextBody();
+    wxString GetVirtualContextBody();
+    wxString GetFooterOfVirtualContextBody();

 
     // can be overriden by top-level context classes
     // to find-out ot the source-fragment of this
 
     // can be overriden by top-level context classes
     // to find-out ot the source-fragment of this


@@ -398,7 +393,7 @@ public:
     spContext* GetOutterContext();
 
     // perhaps more intuitive alias for `GetOutterContext()'
     spContext* GetOutterContext();
 
     // perhaps more intuitive alias for `GetOutterContext()'

-    inline spContext* GetParent() { return mpParent; }
+    inline spContext* GetParent() { return m_pParent; }

 
     bool HasOutterContext();
 
 
     bool HasOutterContext();
 


@@ -415,7 +410,7 @@ public:
     // and it's children. Children's children are not
     // searched recursivelly if searchSubMembers is false
 
     // and it's children. Children's children are not
     // searched recursivelly if searchSubMembers is false
 

-    spContext* FindContext( const string& identifier,
+    spContext* FindContext( const wxString& identifier,

                             int   contextType      = SP_CTX_ANY,
                             bool  searchSubMembers = true
                           );
                             int   contextType      = SP_CTX_ANY,
                             bool  searchSubMembers = true
                           );


@@ -560,7 +555,7 @@ public:
     // scope if any (e.g. MyClass::MyFunction(), scope stirng is "MyClass" )
     // usually found along with implementation of the method, which is now skipped
 
     // scope if any (e.g. MyClass::MyFunction(), scope stirng is "MyClass" )
     // usually found along with implementation of the method, which is now skipped
 

-    string      mScope;
+    wxString    mScope;

 
 public:
     spOperation();
 
 public:
     spOperation();


@@ -632,7 +627,7 @@ public:
     int          mInheritanceType;
 
     // valid if mClassSubType is SP_CLTYPE_TEMPLATE_CLASS
     int          mInheritanceType;
 
     // valid if mClassSubType is SP_CLTYPE_TEMPLATE_CLASS

-    string       mTemplateTypes;
+    wxString     mTemplateTypes;

 
     // true, if it's and interface of abstract base class
     bool         mIsAbstract;
 
     // true, if it's and interface of abstract base class
     bool         mIsAbstract;


@@ -719,6 +714,8 @@ class SourceParserPlugin
 public:
     virtual bool CanUnderstandContext( char* cur, char* end, spContext* pOuttterCtx ) = 0;
     virtual void ParseContext( char* start, char*& cur, char* end, spContext* pOuttterCtx ) = 0;
 public:
     virtual bool CanUnderstandContext( char* cur, char* end, spContext* pOuttterCtx ) = 0;
     virtual void ParseContext( char* start, char*& cur, char* end, spContext* pOuttterCtx ) = 0;

+
+    virtual ~SourceParserPlugin() { }

 };
 
 // abstract interface for source parsers
 };
 
 // abstract interface for source parsers