added functions to read/write several elements at once (patch 754986)

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

diff --git a/wxPython/src/msw/filesys.py b/wxPython/src/msw/filesys.py
index aa62469411a476a3d5682da0225b6d8aab87babb..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)