X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/de20db997ddf7ee903076e72e9918caa2e269c19..8dba8632c5bcd64724e2e9e2d40e295555a0cb86:/wxPython/src/filesys.i?ds=sidebyside diff --git a/wxPython/src/filesys.i b/wxPython/src/filesys.i index 99df7c6049..a37feddb60 100644 --- a/wxPython/src/filesys.i +++ b/wxPython/src/filesys.i @@ -87,7 +87,7 @@ -class wxFSFile { +class wxFSFile : public wxObject { public: wxFSFile(wxInputStream *stream, const wxString& loc, const wxString& mimetype, const wxString& anchor, @@ -151,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); @@ -176,7 +176,7 @@ public: //--------------------------------------------------------------------------- -class wxFileSystem { +class wxFileSystem : public wxObject { public: wxFileSystem(); @@ -273,4 +273,10 @@ def wxMemoryFSHandler_AddFile(filename, a, b=''): " +//--------------------------------------------------------------------------- + +%init %{ + wxPyPtrTypeMap_Add("wxFileSystemHandler", "wxPyFileSystemHandler"); +%} + //---------------------------------------------------------------------------