X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c368d904fc27d35ae1e533155e2154dc496432e4..922ba68045d84789ab1dfceb4d1aa1b6e2c5e810:/wxPython/src/filesys.i

diff --git a/wxPython/src/filesys.i b/wxPython/src/filesys.i
index 7fc6c420c6..a37feddb60 100644
--- a/wxPython/src/filesys.i
+++ b/wxPython/src/filesys.i
@@ -75,7 +75,9 @@
 //              Py_DECREF(arg);
 
 //              // set ThisOwn
-//              PyObject_SetAttrString($target, "thisown", PyInt_FromLong(1));
+//              PyObject* one = PyInt_FromLong(1);
+//              PyObject_SetAttrString($target, "thisown", one);
+//              Py_DECREF(one);
 //          }
 //      } else {
 //          Py_INCREF(Py_None);
@@ -85,7 +87,7 @@
 
 
 
-class wxFSFile {
+class wxFSFile : public wxObject {
 public:
     wxFSFile(wxInputStream *stream, const wxString& loc,
              const wxString& mimetype, const wxString& anchor,
@@ -149,16 +151,16 @@ IMP_PYCALLBACK_STRING__pure(wxPyFileSystemHandler, wxFileSystemHandler, FindNext
 %}
 
 
-%name(wxCPPFileSystemHandler)class wxFileSystemHandler {
-      wxFileSystemHandler();
+%name(wxCPPFileSystemHandler)class wxFileSystemHandler : public wxObject {
+    wxFileSystemHandler();
 }
 
 %name(wxFileSystemHandler)class wxPyFileSystemHandler : public wxFileSystemHandler {
 public:
     wxPyFileSystemHandler();
 
-    void _setSelf(PyObject* self, PyObject* _class);
-    %pragma(python) addtomethod = "__init__:self._setSelf(self, wxFileSystemHandler)"
+    void _setCallbackInfo(PyObject* self, PyObject* _class);
+    %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxFileSystemHandler)"
 
     bool CanOpen(const wxString& location);
     wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location);
@@ -174,7 +176,7 @@ public:
 
 //---------------------------------------------------------------------------
 
-class wxFileSystem {
+class wxFileSystem : public wxObject {
 public:
     wxFileSystem();
 
@@ -271,4 +273,10 @@ def wxMemoryFSHandler_AddFile(filename, a, b=''):
 "
 
 
+//---------------------------------------------------------------------------
+
+%init %{
+    wxPyPtrTypeMap_Add("wxFileSystemHandler", "wxPyFileSystemHandler");
+%}
+
 //---------------------------------------------------------------------------