X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/42e2bbb9e149c589ab03cf6d2adec0617a9f0f24..908f8fc481c0503bf8be5002e5d5208666da7649:/wxPython/src/_filesys.i

diff --git a/wxPython/src/_filesys.i b/wxPython/src/_filesys.i
index 4291d52077..fa76da3e68 100644
--- a/wxPython/src/_filesys.i
+++ b/wxPython/src/_filesys.i
@@ -38,6 +38,8 @@ public:
     ~wxFSFile();
 
     wxInputStream *GetStream();
+    void DetachStream();
+    
     const wxString& GetMimeType();
     const wxString& GetLocation();
     const wxString& GetAnchor();
@@ -111,7 +113,7 @@ public:
 class wxPyFileSystemHandler : public wxFileSystemHandler
 {
 public:
-    %pythonAppend    wxPyFileSystemHandler "self._setCallbackInfo(self, FileSystemHandler)";
+    %pythonAppend    wxPyFileSystemHandler setCallbackInfo(FileSystemHandler)
 
     wxPyFileSystemHandler();
 
@@ -142,9 +144,15 @@ public:
 
 class wxFileSystem : public wxObject {
 public:
+    // turn off this typemap
+    %typemap(out) wxFileSystem*;    
+
     wxFileSystem();
     ~wxFileSystem();
 
+    // Turn it back on again
+    %typemap(out) wxFileSystem* { $result = wxPyMake_wxObject($1, $owner); }
+
     void ChangePathTo(const wxString& location, bool is_dir = false);
     wxString GetPath();
 
@@ -158,6 +166,10 @@ public:
     static void AddHandler(wxFileSystemHandler *handler);
     %cleardisown(wxFileSystemHandler *handler);
 
+    // Removes FS handler
+    %newobject RemoveHandler;
+    static wxFileSystemHandler* RemoveHandler(wxFileSystemHandler *handler);
+
     static void CleanUpHandlers();
 
     // Returns the file URL for a native path