no real changes

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

diff --git a/wxPython/src/filesys.i b/wxPython/src/filesys.i
index 99df7c6049c66853198cb6fe495ef057d86526d8..a37feddb6052433e5416258cac8dbff516d965af 100644 (file)
--- 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,
 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();
 
 }
 
 %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);
 
     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();
 
 public:
     wxFileSystem();
 


@@ -273,4 +273,10 @@ def wxMemoryFSHandler_AddFile(filename, a, b=''):
 "
 
 
 "
 
 

+//---------------------------------------------------------------------------
+
+%init %{
+    wxPyPtrTypeMap_Add("wxFileSystemHandler", "wxPyFileSystemHandler");
+%}
+

 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------