[Pythoncard-cvs] PythonCard/components multicolumnlist.py,1.27,1.28

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

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

Modified Files:
	multicolumnlist.py 
Log Message:
replaced StringType with StringTypes


Index: multicolumnlist.py
===================================================================
RCS file: /cvsroot/pythoncard/PythonCard/components/multicolumnlist.py,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** multicolumnlist.py	11 Aug 2004 14:08:24 -0000	1.27
--- multicolumnlist.py	7 Nov 2004 18:13:13 -0000	1.28
***************
*** 7,11 ****
  import wx
  from wx.lib.mixins.listctrl import ColumnSorterMixin, ListCtrlAutoWidthMixin
! from types import TupleType, ListType, StringType, NoneType, IntType
  from PythonCard import event, widget
  
--- 7,11 ----
  import wx
  from wx.lib.mixins.listctrl import ColumnSorterMixin, ListCtrlAutoWidthMixin
! from types import TupleType, ListType, StringTypes, NoneType, IntType
  from PythonCard import event, widget
  
***************
*** 232,236 ****
              else:
                  aList = map(lambda x:x[:numcols], aList)
!         elif isinstance(aList[0], StringType):
              blanks = [''] * (numcols - 1)
              aList = map(lambda x:[x] + blanks, aList)
--- 232,236 ----
              else:
                  aList = map(lambda x:x[:numcols], aList)
!         elif isinstance(aList[0], StringTypes):
              blanks = [''] * (numcols - 1)
              aList = map(lambda x:[x] + blanks, aList)
***************
*** 249,253 ****
          if position < numitems:
              currentitems = self._getItems()[position:]
!             if isinstance(currentitems[0], StringType):
                  currentitems = map(lambda x:[x], currentitems)
              aList = aList + currentitems
--- 249,253 ----
          if position < numitems:
              currentitems = self._getItems()[position:]
!             if isinstance(currentitems[0], StringTypes):
                  currentitems = map(lambda x:[x], currentitems)
              aList = aList + currentitems
***************
*** 290,294 ****
  
      def _setColumnHeadings(self, aList):
!         if isinstance(aList, ListType) or isinstance(aList, TupleType) or isinstance(aList, StringType):
              pass
          else:
--- 290,294 ----
  
      def _setColumnHeadings(self, aList):
!         if isinstance(aList, ListType) or isinstance(aList, TupleType) or isinstance(aList, StringTypes):
              pass
          else:
***************
*** 299,303 ****
          self._autoresize = 1
  
!         if isinstance(aList, StringType):
              self.InsertColumn(0,aList,width=self.GetBestVirtualSize()[0])
              self._columnHeadings = [aList]
--- 299,303 ----
          self._autoresize = 1
  
!         if isinstance(aList, StringTypes):
              self.InsertColumn(0,aList,width=self.GetBestVirtualSize()[0])
              self._columnHeadings = [aList]
***************
*** 315,324 ****
              self._columnHeadings = aList[:numcols]
  
!         if isinstance(aList[0], StringType):
              for i in xrange(numcols):
                  self.InsertColumn(i, aList[i], width=wx.LIST_AUTOSIZE)
          elif isinstance(aList[0], ListType) or isinstance(aList[0], TupleType):
              w = len(aList[0])
!             if w == 2 and isinstance(aList[0][0], StringType) and isinstance(aList[0][1], IntType):
                  flag = 0
                  for i in xrange(numcols):
--- 315,324 ----
              self._columnHeadings = aList[:numcols]
  
!         if isinstance(aList[0], StringTypes):
              for i in xrange(numcols):
                  self.InsertColumn(i, aList[i], width=wx.LIST_AUTOSIZE)
          elif isinstance(aList[0], ListType) or isinstance(aList[0], TupleType):
              w = len(aList[0])
!             if w == 2 and isinstance(aList[0][0], StringTypes) and isinstance(aList[0][1], IntType):
                  flag = 0
                  for i in xrange(numcols):
***************
*** 329,333 ****
                      self._autoresize = 0
              elif w == 3 and \
!                    isinstance(aList[0][0], StringType) and \
                     isinstance(aList[0][1], IntType) and \
                     isinstance(aList[0][2], IntType):
--- 329,333 ----
                      self._autoresize = 0
              elif w == 3 and \
!                    isinstance(aList[0][0], StringTypes) and \
                     isinstance(aList[0][1], IntType) and \
                     isinstance(aList[0][2], IntType):
***************
*** 339,343 ****
                  if flag:
                      self._autoresize = 0
!             elif w == 1 and isinstance(aList[0][0], StringType):
                  for i in xrange(numcols):
                      self.InsertColumn(i, aList[i][0], width=wx.LIST_AUTOSIZE)
--- 339,343 ----
                  if flag:
                      self._autoresize = 0
!             elif w == 1 and isinstance(aList[0][0], StringTypes):
                  for i in xrange(numcols):
                      self.InsertColumn(i, aList[i][0], width=wx.LIST_AUTOSIZE)
***************
*** 430,434 ****
  
          # If just simple list of strings convert it to a single column list
!         if isinstance(aList[0], StringType):
              aList = map(lambda x:[x], aList)
          elif isinstance(aList[0], ListType) or isinstance(aList[0], TupleType):
--- 430,434 ----
  
          # If just simple list of strings convert it to a single column list
!         if isinstance(aList[0], StringTypes):
              aList = map(lambda x:[x], aList)
          elif isinstance(aList[0], ListType) or isinstance(aList[0], TupleType):