wxUSE_STL=1 compilation fix.

[wxWidgets.git] / wxPython / src / gtk / filesys.py

diff --git a/wxPython/src/gtk/filesys.py b/wxPython/src/gtk/filesys.py
index 512b41100ce78a49623b6ebf3e57e7ca0da0a88d..27c1665beb368af7324d59caac25fe16467cfc44 100644 (file)
--- a/wxPython/src/gtk/filesys.py
+++ b/wxPython/src/gtk/filesys.py
@@ -9,15 +9,16 @@ from misc import *
 
 from gdi import *
 
 
 from gdi import *
 

+from fonts import *
+

 from streams import *
 import wx
 from streams import *
 import wx

-import string

 
 import types
 def wxMemoryFSHandler_AddFile(filename, a, b=''):
 
 import types
 def wxMemoryFSHandler_AddFile(filename, a, b=''):

-    if isinstance(a, wxImage):
+    if wx.wxPy_isinstance(a, (wxImage, wxImagePtr)):

         __wxMemoryFSHandler_AddFile_wxImage(filename, a, b)
         __wxMemoryFSHandler_AddFile_wxImage(filename, a, b)

-    elif isinstance(a, wxBitmap):
+    elif wx.wxPy_isinstance(a, (wxBitmap, wxBitmapPtr)):

         __wxMemoryFSHandler_AddFile_wxBitmap(filename, a, b)
     elif type(a) == types.StringType:
         #__wxMemoryFSHandler_AddFile_wxString(filename, a)
         __wxMemoryFSHandler_AddFile_wxBitmap(filename, a, b)
     elif type(a) == types.StringType:
         #__wxMemoryFSHandler_AddFile_wxString(filename, a)


@@ -29,26 +30,26 @@ class wxFSFilePtr(wxObjectPtr):
         self.this = this
         self.thisown = 0
     def GetStream(self, *_args, **_kwargs):
         self.this = this
         self.thisown = 0
     def GetStream(self, *_args, **_kwargs):

-        val = apply(filesysc.wxFSFile_GetStream,(self,) + _args, _kwargs)
+        val = filesysc.wxFSFile_GetStream(self, *_args, **_kwargs)

         return val
     def GetMimeType(self, *_args, **_kwargs):
         return val
     def GetMimeType(self, *_args, **_kwargs):

-        val = apply(filesysc.wxFSFile_GetMimeType,(self,) + _args, _kwargs)
+        val = filesysc.wxFSFile_GetMimeType(self, *_args, **_kwargs)

         return val
     def GetLocation(self, *_args, **_kwargs):
         return val
     def GetLocation(self, *_args, **_kwargs):

-        val = apply(filesysc.wxFSFile_GetLocation,(self,) + _args, _kwargs)
+        val = filesysc.wxFSFile_GetLocation(self, *_args, **_kwargs)

         return val
     def GetAnchor(self, *_args, **_kwargs):
         return val
     def GetAnchor(self, *_args, **_kwargs):

-        val = apply(filesysc.wxFSFile_GetAnchor,(self,) + _args, _kwargs)
+        val = filesysc.wxFSFile_GetAnchor(self, *_args, **_kwargs)

         return val
     def GetModificationTime(self, *_args, **_kwargs):
         return val
     def GetModificationTime(self, *_args, **_kwargs):

-        val = apply(filesysc.wxFSFile_GetModificationTime,(self,) + _args, _kwargs)
+        val = filesysc.wxFSFile_GetModificationTime(self, *_args, **_kwargs)

         if val: val = wxDateTimePtr(val) ; val.thisown = 1
         return val
     def __repr__(self):
         if val: val = wxDateTimePtr(val) ; val.thisown = 1
         return val
     def __repr__(self):

-        return "<C wxFSFile instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxFSFile instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)

 class wxFSFile(wxFSFilePtr):
     def __init__(self,*_args,**_kwargs):
 class wxFSFile(wxFSFilePtr):
     def __init__(self,*_args,**_kwargs):

-        self.this = apply(filesysc.new_wxFSFile,_args,_kwargs)
+        self.this = filesysc.new_wxFSFile(*_args,**_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -59,7 +60,7 @@ class wxCPPFileSystemHandlerPtr(wxObjectPtr):
         self.this = this
         self.thisown = 0
     def __repr__(self):
         self.this = this
         self.thisown = 0
     def __repr__(self):

-        return "<C wxCPPFileSystemHandler instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxCPPFileSystemHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)

 class wxCPPFileSystemHandler(wxCPPFileSystemHandlerPtr):
     def __init__(self,this):
         self.this = this
 class wxCPPFileSystemHandler(wxCPPFileSystemHandlerPtr):
     def __init__(self,this):
         self.this = this


@@ -71,43 +72,43 @@ class wxFileSystemHandlerPtr(wxCPPFileSystemHandlerPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def _setSelf(self, *_args, **_kwargs):
-        val = apply(filesysc.wxFileSystemHandler__setSelf,(self,) + _args, _kwargs)
+    def _setCallbackInfo(self, *_args, **_kwargs):
+        val = filesysc.wxFileSystemHandler__setCallbackInfo(self, *_args, **_kwargs)

         return val
     def CanOpen(self, *_args, **_kwargs):
         return val
     def CanOpen(self, *_args, **_kwargs):

-        val = apply(filesysc.wxFileSystemHandler_CanOpen,(self,) + _args, _kwargs)
+        val = filesysc.wxFileSystemHandler_CanOpen(self, *_args, **_kwargs)

         return val
     def OpenFile(self, *_args, **_kwargs):
         return val
     def OpenFile(self, *_args, **_kwargs):

-        val = apply(filesysc.wxFileSystemHandler_OpenFile,(self,) + _args, _kwargs)
+        val = filesysc.wxFileSystemHandler_OpenFile(self, *_args, **_kwargs)

         return val
     def FindFirst(self, *_args, **_kwargs):
         return val
     def FindFirst(self, *_args, **_kwargs):

-        val = apply(filesysc.wxFileSystemHandler_FindFirst,(self,) + _args, _kwargs)
+        val = filesysc.wxFileSystemHandler_FindFirst(self, *_args, **_kwargs)

         return val
     def FindNext(self, *_args, **_kwargs):
         return val
     def FindNext(self, *_args, **_kwargs):

-        val = apply(filesysc.wxFileSystemHandler_FindNext,(self,) + _args, _kwargs)
+        val = filesysc.wxFileSystemHandler_FindNext(self, *_args, **_kwargs)

         return val
     def GetProtocol(self, *_args, **_kwargs):
         return val
     def GetProtocol(self, *_args, **_kwargs):

-        val = apply(filesysc.wxFileSystemHandler_GetProtocol,(self,) + _args, _kwargs)
+        val = filesysc.wxFileSystemHandler_GetProtocol(self, *_args, **_kwargs)

         return val
     def GetLeftLocation(self, *_args, **_kwargs):
         return val
     def GetLeftLocation(self, *_args, **_kwargs):

-        val = apply(filesysc.wxFileSystemHandler_GetLeftLocation,(self,) + _args, _kwargs)
+        val = filesysc.wxFileSystemHandler_GetLeftLocation(self, *_args, **_kwargs)

         return val
     def GetAnchor(self, *_args, **_kwargs):
         return val
     def GetAnchor(self, *_args, **_kwargs):

-        val = apply(filesysc.wxFileSystemHandler_GetAnchor,(self,) + _args, _kwargs)
+        val = filesysc.wxFileSystemHandler_GetAnchor(self, *_args, **_kwargs)

         return val
     def GetRightLocation(self, *_args, **_kwargs):
         return val
     def GetRightLocation(self, *_args, **_kwargs):

-        val = apply(filesysc.wxFileSystemHandler_GetRightLocation,(self,) + _args, _kwargs)
+        val = filesysc.wxFileSystemHandler_GetRightLocation(self, *_args, **_kwargs)

         return val
     def GetMimeTypeFromExt(self, *_args, **_kwargs):
         return val
     def GetMimeTypeFromExt(self, *_args, **_kwargs):

-        val = apply(filesysc.wxFileSystemHandler_GetMimeTypeFromExt,(self,) + _args, _kwargs)
+        val = filesysc.wxFileSystemHandler_GetMimeTypeFromExt(self, *_args, **_kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxFileSystemHandler instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxFileSystemHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)

 class wxFileSystemHandler(wxFileSystemHandlerPtr):
     def __init__(self,*_args,**_kwargs):
 class wxFileSystemHandler(wxFileSystemHandlerPtr):
     def __init__(self,*_args,**_kwargs):

-        self.this = apply(filesysc.new_wxFileSystemHandler,_args,_kwargs)
+        self.this = filesysc.new_wxFileSystemHandler(*_args,**_kwargs)

         self.thisown = 1
         self.thisown = 1

-        self._setSelf(self, wxFileSystemHandler)
+        self._setCallbackInfo(self, wxFileSystemHandler)

 
 
 
 
 
 


@@ -117,25 +118,25 @@ class wxFileSystemPtr(wxObjectPtr):
         self.this = this
         self.thisown = 0
     def ChangePathTo(self, *_args, **_kwargs):
         self.this = this
         self.thisown = 0
     def ChangePathTo(self, *_args, **_kwargs):

-        val = apply(filesysc.wxFileSystem_ChangePathTo,(self,) + _args, _kwargs)
+        val = filesysc.wxFileSystem_ChangePathTo(self, *_args, **_kwargs)

         return val
     def GetPath(self, *_args, **_kwargs):
         return val
     def GetPath(self, *_args, **_kwargs):

-        val = apply(filesysc.wxFileSystem_GetPath,(self,) + _args, _kwargs)
+        val = filesysc.wxFileSystem_GetPath(self, *_args, **_kwargs)

         return val
     def OpenFile(self, *_args, **_kwargs):
         return val
     def OpenFile(self, *_args, **_kwargs):

-        val = apply(filesysc.wxFileSystem_OpenFile,(self,) + _args, _kwargs)
+        val = filesysc.wxFileSystem_OpenFile(self, *_args, **_kwargs)

         return val
     def FindFirst(self, *_args, **_kwargs):
         return val
     def FindFirst(self, *_args, **_kwargs):

-        val = apply(filesysc.wxFileSystem_FindFirst,(self,) + _args, _kwargs)
+        val = filesysc.wxFileSystem_FindFirst(self, *_args, **_kwargs)

         return val
     def FindNext(self, *_args, **_kwargs):
         return val
     def FindNext(self, *_args, **_kwargs):

-        val = apply(filesysc.wxFileSystem_FindNext,(self,) + _args, _kwargs)
+        val = filesysc.wxFileSystem_FindNext(self, *_args, **_kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxFileSystem instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxFileSystem instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)

 class wxFileSystem(wxFileSystemPtr):
     def __init__(self,*_args,**_kwargs):
 class wxFileSystem(wxFileSystemPtr):
     def __init__(self,*_args,**_kwargs):

-        self.this = apply(filesysc.new_wxFileSystem,_args,_kwargs)
+        self.this = filesysc.new_wxFileSystem(*_args,**_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -146,16 +147,16 @@ class wxInternetFSHandlerPtr(wxCPPFileSystemHandlerPtr):
         self.this = this
         self.thisown = 0
     def CanOpen(self, *_args, **_kwargs):
         self.this = this
         self.thisown = 0
     def CanOpen(self, *_args, **_kwargs):

-        val = apply(filesysc.wxInternetFSHandler_CanOpen,(self,) + _args, _kwargs)
+        val = filesysc.wxInternetFSHandler_CanOpen(self, *_args, **_kwargs)

         return val
     def OpenFile(self, *_args, **_kwargs):
         return val
     def OpenFile(self, *_args, **_kwargs):

-        val = apply(filesysc.wxInternetFSHandler_OpenFile,(self,) + _args, _kwargs)
+        val = filesysc.wxInternetFSHandler_OpenFile(self, *_args, **_kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxInternetFSHandler instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxInternetFSHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)

 class wxInternetFSHandler(wxInternetFSHandlerPtr):
     def __init__(self,*_args,**_kwargs):
 class wxInternetFSHandler(wxInternetFSHandlerPtr):
     def __init__(self,*_args,**_kwargs):

-        self.this = apply(filesysc.new_wxInternetFSHandler,_args,_kwargs)
+        self.this = filesysc.new_wxInternetFSHandler(*_args,**_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -166,22 +167,22 @@ class wxZipFSHandlerPtr(wxCPPFileSystemHandlerPtr):
         self.this = this
         self.thisown = 0
     def CanOpen(self, *_args, **_kwargs):
         self.this = this
         self.thisown = 0
     def CanOpen(self, *_args, **_kwargs):

-        val = apply(filesysc.wxZipFSHandler_CanOpen,(self,) + _args, _kwargs)
+        val = filesysc.wxZipFSHandler_CanOpen(self, *_args, **_kwargs)

         return val
     def OpenFile(self, *_args, **_kwargs):
         return val
     def OpenFile(self, *_args, **_kwargs):

-        val = apply(filesysc.wxZipFSHandler_OpenFile,(self,) + _args, _kwargs)
+        val = filesysc.wxZipFSHandler_OpenFile(self, *_args, **_kwargs)

         return val
     def FindFirst(self, *_args, **_kwargs):
         return val
     def FindFirst(self, *_args, **_kwargs):

-        val = apply(filesysc.wxZipFSHandler_FindFirst,(self,) + _args, _kwargs)
+        val = filesysc.wxZipFSHandler_FindFirst(self, *_args, **_kwargs)

         return val
     def FindNext(self, *_args, **_kwargs):
         return val
     def FindNext(self, *_args, **_kwargs):

-        val = apply(filesysc.wxZipFSHandler_FindNext,(self,) + _args, _kwargs)
+        val = filesysc.wxZipFSHandler_FindNext(self, *_args, **_kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxZipFSHandler instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxZipFSHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)

 class wxZipFSHandler(wxZipFSHandlerPtr):
     def __init__(self,*_args,**_kwargs):
 class wxZipFSHandler(wxZipFSHandlerPtr):
     def __init__(self,*_args,**_kwargs):

-        self.this = apply(filesysc.new_wxZipFSHandler,_args,_kwargs)
+        self.this = filesysc.new_wxZipFSHandler(*_args,**_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -192,22 +193,22 @@ class wxMemoryFSHandlerPtr(wxCPPFileSystemHandlerPtr):
         self.this = this
         self.thisown = 0
     def CanOpen(self, *_args, **_kwargs):
         self.this = this
         self.thisown = 0
     def CanOpen(self, *_args, **_kwargs):

-        val = apply(filesysc.wxMemoryFSHandler_CanOpen,(self,) + _args, _kwargs)
+        val = filesysc.wxMemoryFSHandler_CanOpen(self, *_args, **_kwargs)

         return val
     def OpenFile(self, *_args, **_kwargs):
         return val
     def OpenFile(self, *_args, **_kwargs):

-        val = apply(filesysc.wxMemoryFSHandler_OpenFile,(self,) + _args, _kwargs)
+        val = filesysc.wxMemoryFSHandler_OpenFile(self, *_args, **_kwargs)

         return val
     def FindFirst(self, *_args, **_kwargs):
         return val
     def FindFirst(self, *_args, **_kwargs):

-        val = apply(filesysc.wxMemoryFSHandler_FindFirst,(self,) + _args, _kwargs)
+        val = filesysc.wxMemoryFSHandler_FindFirst(self, *_args, **_kwargs)

         return val
     def FindNext(self, *_args, **_kwargs):
         return val
     def FindNext(self, *_args, **_kwargs):

-        val = apply(filesysc.wxMemoryFSHandler_FindNext,(self,) + _args, _kwargs)
+        val = filesysc.wxMemoryFSHandler_FindNext(self, *_args, **_kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxMemoryFSHandler instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxMemoryFSHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)

 class wxMemoryFSHandler(wxMemoryFSHandlerPtr):
     def __init__(self,*_args,**_kwargs):
 class wxMemoryFSHandler(wxMemoryFSHandlerPtr):
     def __init__(self,*_args,**_kwargs):

-        self.this = apply(filesysc.new_wxMemoryFSHandler,_args,_kwargs)
+        self.this = filesysc.new_wxMemoryFSHandler(*_args,**_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -217,6 +218,8 @@ class wxMemoryFSHandler(wxMemoryFSHandlerPtr):
 
 #-------------- FUNCTION WRAPPERS ------------------
 
 
 #-------------- FUNCTION WRAPPERS ------------------
 

+wxFileSystem_URLToFileName = filesysc.wxFileSystem_URLToFileName
+

 __wxMemoryFSHandler_AddFile_wxImage = filesysc.__wxMemoryFSHandler_AddFile_wxImage
 
 __wxMemoryFSHandler_AddFile_wxBitmap = filesysc.__wxMemoryFSHandler_AddFile_wxBitmap
 __wxMemoryFSHandler_AddFile_wxImage = filesysc.__wxMemoryFSHandler_AddFile_wxImage
 
 __wxMemoryFSHandler_AddFile_wxBitmap = filesysc.__wxMemoryFSHandler_AddFile_wxBitmap


@@ -227,6 +230,8 @@ wxFileSystem_AddHandler = filesysc.wxFileSystem_AddHandler
 
 wxFileSystem_CleanUpHandlers = filesysc.wxFileSystem_CleanUpHandlers
 
 
 wxFileSystem_CleanUpHandlers = filesysc.wxFileSystem_CleanUpHandlers
 

+wxFileSystem_FileNameToURL = filesysc.wxFileSystem_FileNameToURL
+

 wxMemoryFSHandler_RemoveFile = filesysc.wxMemoryFSHandler_RemoveFile
 
 
 wxMemoryFSHandler_RemoveFile = filesysc.wxMemoryFSHandler_RemoveFile