// Name: filesys.i
// Purpose: SWIG definitions of the wxFileSystem family of classes
//
-// Author: Joerg Baumann
+// Author: Joerg Baumann and Robin Dunn
//
// Created: 25-Sept-2000
// RCS-ID: $Id$
%{
#include "helpers.h"
+#include "pyistream.h"
#include <wx/filesys.h>
#include <wx/fs_inet.h>
#include <wx/fs_mem.h>
//---------------------------------------------------------------------------
-// // typemaps for wxInputStream: Note wxFSFile object has to do the delete
-// // of wxInputStream *
-// %typemap(python,in) wxInputStream *stream {
-// if (PyInstance_Check($source)) {
-// wxPyInputStream* ptr;
-// if (SWIG_GetPtrObj($source, (void **) &ptr,"_wxPyInputStream_p")) {
-// PyErr_SetString(PyExc_TypeError,"Expected _wxInputStream_p.");
-// return NULL;
-// }
-// $target = ptr->wxi;
-// } else {
-// PyErr_SetString(PyExc_TypeError,"Expected _wxInputStream_p.");
-// return NULL;
-// }
-// }
-
-
-// // typemaps for wxInputStream: Note wxFSFile object has to do the delete
-// // of wxInputStream *
-// %typemap(python,out) wxInputStream* {
-// wxPyInputStream * _ptr = NULL;
-
-// if ($source) {
-// _ptr = new wxPyInputStream($source);
-// }
-// if (_ptr) {
-// char swigptr[64];
-// SWIG_MakePtr(swigptr, _ptr, "_wxPyInputStream_p");
-
-// PyObject* classobj = PyDict_GetItemString(wxPython_dict, "wxInputStreamPtr");
-// if (! classobj) {
-// Py_INCREF(Py_None);
-// $target = Py_None;
-// } else {
-// PyObject* arg = Py_BuildValue("(s)", swigptr);
-// $target = PyInstance_New(classobj, arg, NULL);
-// Py_DECREF(arg);
-
-// // set ThisOwn
-// PyObject_SetAttrString($target, "thisown", PyInt_FromLong(1));
-// }
-// } else {
-// Py_INCREF(Py_None);
-// $target = Py_None;
-// }
-// }
-
-
-class wxFSFile {
+class wxFSFile : public wxObject {
public:
wxFSFile(wxInputStream *stream, const wxString& loc,
const wxString& mimetype, const wxString& anchor,
%}
-%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);
//---------------------------------------------------------------------------
-class wxFileSystem {
+class wxFileSystem : public wxObject {
public:
wxFileSystem();
"
+//---------------------------------------------------------------------------
+
+%init %{
+ wxPyPtrTypeMap_Add("wxFileSystemHandler", "wxPyFileSystemHandler");
+%}
+
//---------------------------------------------------------------------------