fix for stupid segfault

[wxWidgets.git] / contrib / src / applet / prepinclude.cpp

diff --git a/contrib/src/applet/prepinclude.cpp b/contrib/src/applet/prepinclude.cpp
index 600bd305798bec475f6f40abb9ceb6e87ce3d24e..83d494875e8818b05257a301562b92441e33a292 100644 (file)
--- a/contrib/src/applet/prepinclude.cpp
+++ b/contrib/src/applet/prepinclude.cpp
@@ -59,8 +59,6 @@ wxString wxIncludePrep::Process(
     int i;
        char ft[] = "<!--#include virtual=";
        
     int i;
        char ft[] = "<!--#include virtual=";
        

-    wxFileSystem *fs = new wxFileSystem;
-    fs->ChangePathTo(DOC_ROOT, true);

 
     int openedcount = 0;
 
 
     int openedcount = 0;
 


@@ -92,8 +90,9 @@ wxString wxIncludePrep::Process(
                // remove the #include tag
         output.Remove(i, n+21+3);
 
                // remove the #include tag
         output.Remove(i, n+21+3);
 

-        wxFSFile * file = fs->OpenFile(fname);
-                       
+        wxFSFile * file;
+        file = m_FS->OpenFile(fname);
+       

         if (!file) {
 #ifdef CHECKED         
                        wxMessageBox(wxString("wxHTML #include error: File not Found ") + fname + wxString("."),"Error",wxICON_ERROR);
         if (!file) {
 #ifdef CHECKED         
                        wxMessageBox(wxString("wxHTML #include error: File not Found ") + fname + wxString("."),"Error",wxICON_ERROR);


@@ -125,7 +124,6 @@ wxString wxIncludePrep::Process(
         delete file;
         }
        
         delete file;
         }
        

-       delete fs;

        return output;
 }
 
        return output;
 }
 


@@ -138,9 +136,8 @@ This function sets the directory to get included HTML files from. The default
 value is the current directory. Directorys may be given as a relative path.
 ****************************************************************************/
 void wxIncludePrep::ChangeDirectory(
 value is the current directory. Directorys may be given as a relative path.
 ****************************************************************************/
 void wxIncludePrep::ChangeDirectory(

-    const wxString &dir)
+    wxFileSystem *fs)

 {
 {

-
-    DOC_ROOT = dir;
+     m_FS = fs;

 }
 
 }