Update of /cvsroot/pythoncard/PythonCard
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2898
Modified Files:
graphic.py
Log Message:
updated to treat None and '' (empty string) the same for filename
Index: graphic.py
===================================================================
RCS file: /cvsroot/pythoncard/PythonCard/graphic.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** graphic.py 28 Jul 2004 07:12:07 -0000 1.15
--- graphic.py 24 Oct 2004 19:56:29 -0000 1.16
***************
*** 79,88 ****
class Bitmap :
! def __init__(self, fileName='', size=(-1, -1)):
! self._fileName = fileName
# KEA 2004-07-27
# Mac checks that the bitmap is Ok() so need
# to use a valid size
! if (self._fileName == '') and (tuple(size) == (-1, -1)):
self._size = (10, 10)
else:
--- 79,91 ----
class Bitmap :
! def __init__(self, fileName=None, size=(-1, -1)):
! if fileName is None or fileName == '':
! self._fileName = None
! else:
! self._fileName = fileName
# KEA 2004-07-27
# Mac checks that the bitmap is Ok() so need
# to use a valid size
! if (self._fileName is None) and (tuple(size) == (-1, -1)):
self._size = (10, 10)
else:
***************
*** 133,137 ****
#name, ext = filename.split( '.' )
#ext = ext.upper()
! if filename == '':
return None
--- 136,140 ----
#name, ext = filename.split( '.' )
#ext = ext.upper()
! if filename is None or filename == '':
return None
***************
*** 166,170 ****
# xbm format doesn't seem to work on Windows
def loadFile(self, filename=None, size=None):
! if filename is not None:
self._fileName = fileName
if size is not None:
--- 169,175 ----
# xbm format doesn't seem to work on Windows
def loadFile(self, filename=None, size=None):
! if filename is None or filename == '':
! self._fileName = None
! else:
self._fileName = fileName
if size is not None:
***************
*** 174,178 ****
self._bits = wx.EmptyBitmap(self._size[0], self._size[1])
else:
! self._bits = wx.Bitmap( self._fileName, self._type )
# attempting to save a GIF image will result in a zero length file
--- 179,183 ----
self._bits = wx.EmptyBitmap(self._size[0], self._size[1])
else:
! self._bits = wx.Bitmap(self._fileName, self._type)
# attempting to save a GIF image will result in a zero length file
|
