Fixed initialisation order warning

[wxWidgets.git] / include / wx / filesys.h

diff --git a/include/wx/filesys.h b/include/wx/filesys.h
index 354d940275d8bfdc8ba94c6e1ccba26737610e9a..bda6d7c5dd341cc7e721bbcca723be951dc7320f 100644 (file)
--- a/include/wx/filesys.h
+++ b/include/wx/filesys.h
@@ -48,6 +48,7 @@ public:
              )
     {
         m_Stream = stream;
              )
     {
         m_Stream = stream;

+        m_destroy = true;

         m_Location = loc;
         m_MimeType = mimetype; m_MimeType.MakeLower();
         m_Anchor = anchor;
         m_Location = loc;
         m_MimeType = mimetype; m_MimeType.MakeLower();
         m_Anchor = anchor;


@@ -56,12 +57,15 @@ public:
 #endif // wxUSE_DATETIME
     }
 
 #endif // wxUSE_DATETIME
     }
 

-    virtual ~wxFSFile() { if (m_Stream) delete m_Stream; }
+    virtual ~wxFSFile() { if (m_Stream && m_destroy) delete m_Stream; }

 
     // returns stream. This doesn't _create_ stream, it only returns
     // pointer to it.
     wxInputStream *GetStream() const {return m_Stream;}
 
 
     // returns stream. This doesn't _create_ stream, it only returns
     // pointer to it.
     wxInputStream *GetStream() const {return m_Stream;}
 

+    // gives away the ownership of stream
+    void DetachStream() { m_destroy = false; }
+

     // returns file's mime type
     const wxString& GetMimeType() const {return m_MimeType;}
 
     // returns file's mime type
     const wxString& GetMimeType() const {return m_MimeType;}
 


@@ -76,6 +80,7 @@ public:
 
 private:
     wxInputStream *m_Stream;
 
 private:
     wxInputStream *m_Stream;

+    bool m_destroy;

     wxString m_Location;
     wxString m_MimeType;
     wxString m_Anchor;
     wxString m_Location;
     wxString m_MimeType;
     wxString m_Anchor;


@@ -188,6 +193,10 @@ public:
     // In fact, this class is only front-end to the FS handlers :-)
     static void AddHandler(wxFileSystemHandler *handler);
 
     // In fact, this class is only front-end to the FS handlers :-)
     static void AddHandler(wxFileSystemHandler *handler);
 

+    // Removes FS handler
+    static wxFileSystemHandler* RemoveHandler(wxFileSystemHandler *handler);
+
+

     // Returns true if there is a handler which can open the given location.
     static bool HasHandlerForPath(const wxString& location);
 
     // Returns true if there is a handler which can open the given location.
     static bool HasHandlerForPath(const wxString& location);