X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d69225772ad1ff3952a3ee74055dc93f85c13812..1b48afd23db9e8b5bfac8323c292b08f8f9f2e0e:/utils/HelpGen/src/sourcepainter.h diff --git a/utils/HelpGen/src/sourcepainter.h b/utils/HelpGen/src/sourcepainter.h index e2689ca658..4b6b238d2b 100644 --- a/utils/HelpGen/src/sourcepainter.h +++ b/utils/HelpGen/src/sourcepainter.h @@ -32,13 +32,6 @@ #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 @@ -63,7 +56,7 @@ class SourcePainter { protected: - string mResultStr; + wxString mResultStr; SPBlockListT mBlocks; bool mCollectResultsOn; @@ -93,7 +86,7 @@ public: // 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)