wxUSE_STL=1 compilation fix.

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

diff --git a/wxPython/src/msw/filesys.py b/wxPython/src/msw/filesys.py
index 512b41100ce78a49623b6ebf3e57e7ca0da0a88d..8950e6059b74d9c6137c2f597814d8788ca7c436 100644 (file)
--- a/wxPython/src/msw/filesys.py
+++ b/wxPython/src/msw/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)


@@ -71,8 +72,8 @@ 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 = apply(filesysc.wxFileSystemHandler__setCallbackInfo,(self,) + _args, _kwargs)

         return val
     def CanOpen(self, *_args, **_kwargs):
         val = apply(filesysc.wxFileSystemHandler_CanOpen,(self,) + _args, _kwargs)
         return val
     def CanOpen(self, *_args, **_kwargs):
         val = apply(filesysc.wxFileSystemHandler_CanOpen,(self,) + _args, _kwargs)


@@ -107,7 +108,7 @@ class wxFileSystemHandler(wxFileSystemHandlerPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(filesysc.new_wxFileSystemHandler,_args,_kwargs)
         self.thisown = 1
     def __init__(self,*_args,**_kwargs):
         self.this = apply(filesysc.new_wxFileSystemHandler,_args,_kwargs)
         self.thisown = 1

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