Moved wxRichTextCtrl to its own library

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

diff --git a/utils/HelpGen/src/sourcepainter.h b/utils/HelpGen/src/sourcepainter.h
index e2689ca658a15936b52d7cba85a29b54de5bdd2e..4b6b238d2bed0865849824cbab830b09c2f20b86 100644 (file)
--- a/utils/HelpGen/src/sourcepainter.h
+++ b/utils/HelpGen/src/sourcepainter.h
@@ -32,13 +32,6 @@
     #include "wxstlvec.h"
     #include "wx/string.h"
 
     #include "wxstlvec.h"
     #include "wx/string.h"
 

-    #if wxUSE_STD_STRING
-        using std::string;
-    #else
-        // FIXME:: dirty!
-        #define  string wxString
-    #endif
-

     typedef WXSTL_VECTOR_SHALLOW_COPY(int) SPBlockListT;
 
 #endif
     typedef WXSTL_VECTOR_SHALLOW_COPY(int) SPBlockListT;
 
 #endif


@@ -63,7 +56,7 @@
 class SourcePainter
 {
 protected:
 class SourcePainter
 {
 protected:

-    string          mResultStr;
+    wxString        mResultStr;

     SPBlockListT    mBlocks;
     bool            mCollectResultsOn;
 
     SPBlockListT    mBlocks;
     bool            mCollectResultsOn;
 


@@ -93,7 +86,7 @@ public:
     // generates string of highlighted source for the scipting
     // language given by "tags" argument
 
     // generates string of highlighted source for the scipting
     // language given by "tags" argument
 

-    virtual void GetResultString(string& result, MarkupTagsT tags);
+    virtual void GetResultString(wxString& result, MarkupTagsT tags);

 
     // returns vector of block descriptors, see SPBlockListT definition
     // (block descriptors can be used for fast custom highlighted text generation)
 
     // returns vector of block descriptors, see SPBlockListT definition
     // (block descriptors can be used for fast custom highlighted text generation)