[Pythoncard-cvs] PythonCard graphic.py,1.16,1.17

[Kevin A. <ka...@us...>]

Update of /cvsroot/pythoncard/PythonCard
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32141

Modified Files:
	graphic.py 
Log Message:
hopefully fixed image


Index: graphic.py
===================================================================
RCS file: /cvsroot/pythoncard/PythonCard/graphic.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** graphic.py	24 Oct 2004 19:56:29 -0000	1.16
--- graphic.py	24 Oct 2004 22:01:19 -0000	1.17
***************
*** 79,96 ****
  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:
              self._size = size
          self._type = None
!         self.loadFile()
  
      def getBits( self ) :
--- 79,96 ----
  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:
              self._size = size
          self._type = None
!         self.loadFile(self._filename, self._size)
  
      def getBits( self ) :
***************
*** 168,188 ****
  
      # 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:
              self._size = size
!         self._type = self._getBitmapType(self._fileName)
          if self._type is None:
              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
      def saveFile(self, filename=None):
          if filename is None:
!             filename = self._fileName
          try:
              self._bits.SaveFile(filename, self._getBitmapType(filename))
--- 168,190 ----
  
      # xbm format doesn't seem to work on Windows
!     def loadFile(self, filename=None, size=(-1, -1)):
          if filename is None or filename == '':
!             self._filename = None
!         else:
!             self._filename = filename
!         if (self._filename is None) and (tuple(size) == (-1, -1)):
!             self._size = (10, 10)
          else:
              self._size = size
!         self._type = self._getBitmapType(self._filename)
          if self._type is None:
              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
      def saveFile(self, filename=None):
          if filename is None:
!             filename = self._filename
          try:
              self._bits.SaveFile(filename, self._getBitmapType(filename))