Add wxPyTabArt

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

diff --git a/wxPython/src/_filesys.i b/wxPython/src/_filesys.i
index bdcc819ed4e60f6d96ae166631ff061f6c6b21c8..8975133d3d522686ca43129bd905143c8cac2e4f 100644 (file)
--- a/wxPython/src/_filesys.i
+++ b/wxPython/src/_filesys.i
@@ -26,20 +26,31 @@
 class wxFSFile : public wxObject
 {
 public:
 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(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();
 
     wxInputStream *GetStream();

+    void DetachStream();
+    

     const wxString& GetMimeType();
     const wxString& GetLocation();
     const wxString& GetAnchor();
     wxDateTime GetModificationTime();
     const wxString& GetMimeType();
     const wxString& GetLocation();
     const wxString& GetAnchor();
     wxDateTime GetModificationTime();

+
+    %property(Anchor, GetAnchor, doc="See `GetAnchor`");
+    %property(Location, GetLocation, doc="See `GetLocation`");
+    %property(MimeType, GetMimeType, doc="See `GetMimeType`");
+    %property(ModificationTime, GetModificationTime, doc="See `GetModificationTime`");
+    %property(Stream, GetStream, doc="See `GetStream`");
+    

 };
 
 
 };
 
 


@@ -93,6 +104,7 @@ class wxFileSystemHandler //: public wxObject
 {
 public:
     //wxFileSystemHandler();
 {
 public:
     //wxFileSystemHandler();

+    ~wxFileSystemHandler();

 };
 
 
 };
 
 


@@ -102,7 +114,7 @@ class wxPyFileSystemHandler : public wxFileSystemHandler
 {
 public:
     %pythonAppend    wxPyFileSystemHandler "self._setCallbackInfo(self, FileSystemHandler)";
 {
 public:
     %pythonAppend    wxPyFileSystemHandler "self._setCallbackInfo(self, FileSystemHandler)";

-    
+

     wxPyFileSystemHandler();
 
     void _setCallbackInfo(PyObject* self, PyObject* _class);
     wxPyFileSystemHandler();
 
     void _setCallbackInfo(PyObject* self, PyObject* _class);


@@ -118,6 +130,12 @@ public:
     wxString GetAnchor(const wxString& location);
     wxString GetRightLocation(const wxString& location);
     wxString GetMimeTypeFromExt(const wxString& location);
     wxString GetAnchor(const wxString& location);
     wxString GetRightLocation(const wxString& location);
     wxString GetMimeTypeFromExt(const wxString& location);

+    
+    %property(Anchor, GetAnchor, doc="See `GetAnchor`");
+    %property(LeftLocation, GetLeftLocation, doc="See `GetLeftLocation`");
+    %property(MimeTypeFromExt, GetMimeTypeFromExt, doc="See `GetMimeTypeFromExt`");
+    %property(Protocol, GetProtocol, doc="See `GetProtocol`");
+    %property(RightLocation, GetRightLocation, doc="See `GetRightLocation`");

 };
 
 
 };
 
 


@@ -126,9 +144,15 @@ public:
 
 class wxFileSystem : public wxObject {
 public:
 
 class wxFileSystem : public wxObject {
 public:

+    // turn off this typemap
+    %typemap(out) wxFileSystem*;    
+

     wxFileSystem();
     ~wxFileSystem();
 
     wxFileSystem();
     ~wxFileSystem();
 

+    // Turn it back on again
+    %typemap(out) wxFileSystem* { $result = wxPyMake_wxObject($1, $owner); }
+

     void ChangePathTo(const wxString& location, bool is_dir = false);
     wxString GetPath();
 
     void ChangePathTo(const wxString& location, bool is_dir = false);
     wxString GetPath();
 


@@ -138,7 +162,14 @@ public:
     wxString FindFirst(const wxString& spec, int flags = 0);
     wxString FindNext();
 
     wxString FindFirst(const wxString& spec, int flags = 0);
     wxString FindNext();
 

+    %disownarg(wxFileSystemHandler *handler);

     static void AddHandler(wxFileSystemHandler *handler);
     static void AddHandler(wxFileSystemHandler *handler);

+    %cleardisown(wxFileSystemHandler *handler);
+
+    // Removes FS handler
+    %newobject RemoveHandler;
+    static wxFileSystemHandler* RemoveHandler(wxFileSystemHandler *handler);
+

     static void CleanUpHandlers();
 
     // Returns the file URL for a native path
     static void CleanUpHandlers();
 
     // Returns the file URL for a native path


@@ -151,7 +182,9 @@ public:
             wxFileName fname = wxFileSystem::URLToFileName(url);
             return fname.GetFullPath();
         }
             wxFileName fname = wxFileSystem::URLToFileName(url);
             return fname.GetFullPath();
         }

-    }   
+    }
+
+    %property(Path, GetPath, doc="See `GetPath`");

 };
 
 
 };
 
 


@@ -206,7 +239,7 @@ public:
             return;
         }
 
             return;
         }
 

-        bool blocked = wxPyBeginBlockThreads();
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();

         void*  ptr = (void*)PyString_AsString(data);
         size_t size = PyString_Size(data);
         wxPyEndBlockThreads(blocked);
         void*  ptr = (void*)PyString_AsString(data);
         size_t size = PyString_Size(data);
         wxPyEndBlockThreads(blocked);


@@ -246,7 +279,7 @@ public:
 
     // Add a file to the memory FS
     %pythoncode { AddFile = staticmethod(MemoryFSHandler_AddFile) }
 
     // 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);
     bool CanOpen(const wxString& location);
     %newobject OpenFile;
     wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location);