compilation fix for !wxUSE_THREADS

[wxWidgets.git] / utils / HelpGen / src / ifcontext.cpp

diff --git a/utils/HelpGen/src/ifcontext.cpp b/utils/HelpGen/src/ifcontext.cpp
index 01488de4db23f5526b7c4f64194106ed7d68e47c..d1a36e54c8cbca8f1a4d6de06eee7f2c29a82575 100644 (file)
--- a/utils/HelpGen/src/ifcontext.cpp
+++ b/utils/HelpGen/src/ifcontext.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#  pragma implementation "ifcontext.h"
-#endif
-
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
@@ -24,9 +20,6 @@
 #include "wx/wx.h"
 #endif
 
-#ifndef __DARWIN__
-#  include <malloc.h>
-#endif
 #include <stdio.h>
 
 #include "ifcontext.h"
@@ -92,8 +85,8 @@ void spInterFileContext::InsertBookmarkSorted( BookmarkListT& lst, spBookmark& m
     lst.push_back( mark );
 }
 
-void spInterFileContext::DoAppendSourceFragment( string& source,
-                                                 string& result,
+void spInterFileContext::DoAppendSourceFragment( wxString& source,
+                                                 wxString& result,
                                                  size_t  pos, size_t len )
 {
     mFiltered.erase( mFiltered.begin(), mFiltered.end() );
@@ -132,8 +125,8 @@ void spInterFileContext::DoAppendSourceFragment( string& source,
 }
 
 void spInterFileContext::GenerateContextBody( spContext& ctx,
-                                              string&    source,
-                                              string&    result,
+                                              wxString&  source,
+                                              wxString&  result,
                                               size_t&    lastSavedPos,
                                               size_t&    lastKnownPos )
 {
@@ -251,7 +244,7 @@ void spInterFileContext::ParseContents( SourceParserPlugin* pPlugin )
 
     for( size_t i = 0; i != m_Files.size(); ++i )
     {
-        wxChar* s = (char*)(m_Contents[i].c_str());
+        wxWritableCharBuffer s(m_Contents[i].char_str());
 
         spFile* pFCtx = mParser.Parse( s, s + m_Contents[i].length() );