Add dtor for wxCalendarDateAttr

[wxWidgets.git] / wxPython / src / _filesys.i

diff --git a/wxPython/src/_filesys.i b/wxPython/src/_filesys.i
index d02c4d874809d8e1188d6eebfa8ce0814fb0a96d..a423b23fe5cdffac91d7e460a9878cf1a1d3deb4 100644 (file)
--- a/wxPython/src/_filesys.i
+++ b/wxPython/src/_filesys.i
@@ -26,14 +26,16 @@
 class wxFSFile : public wxObject
 {
 public:
-    %pythonAppend wxFSFile
-        "self.thisown = 0   # It will normally be deleted by the user of the wx.FileSystem";
+    %typemap(out) wxFSFile*;    // turn off this typemap
 
     wxFSFile(wxInputStream *stream, const wxString& loc,
              const wxString& mimetype, const wxString& anchor,
              wxDateTime modif);
-    
-    ~wxFSFile();  
+
+    // Turn it back on.
+    %typemap(out) wxFSFile* { $result = wxPyMake_wxObject($1, $owner); }
+
+    ~wxFSFile();
 
     wxInputStream *GetStream();
     const wxString& GetMimeType();
@@ -93,6 +95,7 @@ class wxFileSystemHandler //: public wxObject
 {
 public:
     //wxFileSystemHandler();
+    ~wxFileSystemHandler();
 };
 
 
@@ -102,7 +105,7 @@ class wxPyFileSystemHandler : public wxFileSystemHandler
 {
 public:
     %pythonAppend    wxPyFileSystemHandler "self._setCallbackInfo(self, FileSystemHandler)";
-    
+
     wxPyFileSystemHandler();
 
     void _setCallbackInfo(PyObject* self, PyObject* _class);
@@ -138,7 +141,10 @@ public:
     wxString FindFirst(const wxString& spec, int flags = 0);
     wxString FindNext();
 
+    %disownarg(wxFileSystemHandler *handler);
     static void AddHandler(wxFileSystemHandler *handler);
+    %cleardisown(wxFileSystemHandler *handler);
+
     static void CleanUpHandlers();
 
     // Returns the file URL for a native path
@@ -151,7 +157,7 @@ public:
             wxFileName fname = wxFileSystem::URLToFileName(url);
             return fname.GetFullPath();
         }
-    }   
+    }
 };
 
 
@@ -246,7 +252,7 @@ public:
 
     // Add a file to the memory FS
     %pythoncode { AddFile = staticmethod(MemoryFSHandler_AddFile) }
-    
+
     bool CanOpen(const wxString& location);
     %newobject OpenFile;
     wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location);