[pywin32-checkins] pywin32/Pythonwin/pywin/scintilla view.py, 1.31, 1.32 formatter.py, 1.16, 1.17

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/scintilla
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv12025/pywin/scintilla

Modified Files:
	view.py formatter.py 
Log Message:
use py2k and py3k friendly array formats for talking to scintilla

Index: view.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/scintilla/view.py,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** view.py	27 Nov 2008 09:33:22 -0000	1.31
--- view.py	3 Jan 2009 05:52:28 -0000	1.32
***************
*** 652,658 ****
  		hdcFormat = dc.GetHandleAttrib()
  		fr = struct.pack(fmt, hdcRender, hdcFormat, rc[0], rc[1], rc[2], rc[3], rc[0], rc[1], rc[2], rc[3], pageStart, lengthDoc)
! 		frBuff = array.array('c', fr)
! 		addressFrBuff = frBuff.buffer_info()[0]
! 		nextPageStart = self.SendScintilla(EM_FORMATRANGE, draw, addressFrBuff)
  		return nextPageStart
  
--- 652,656 ----
  		hdcFormat = dc.GetHandleAttrib()
  		fr = struct.pack(fmt, hdcRender, hdcFormat, rc[0], rc[1], rc[2], rc[3], rc[0], rc[1], rc[2], rc[3], pageStart, lengthDoc)
! 		nextPageStart = self.SendScintilla(EM_FORMATRANGE, draw, fr)
  		return nextPageStart
  

Index: formatter.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/scintilla/formatter.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** formatter.py	27 Nov 2008 09:42:41 -0000	1.16
--- formatter.py	3 Jan 2009 05:52:28 -0000	1.17
***************
*** 225,229 ****
  		stylenum = self.styles[styleName].stylenum
  		while start<end:
! 			self.style_buffer[start]=chr(stylenum)
  			start = start+1
  		#self.scintilla.SCISetStyling(end - start + 1, stylenum)
--- 225,229 ----
  		stylenum = self.styles[styleName].stylenum
  		while start<end:
! 			self.style_buffer[start]=stylenum
  			start = start+1
  		#self.scintilla.SCISetStyling(end - start + 1, stylenum)
***************
*** 248,252 ****
  #		trace("Coloring", start, end, end-start, len(stringVal), styleStart, self.scintilla.SCIGetCharAt(start))
  		scintilla.SCIStartStyling(start, 31)
! 		self.style_buffer = array.array("c", chr(0)*len(stringVal))
  		self.ColorizeString(stringVal, styleStart)
  		scintilla.SCISetStylingEx(self.style_buffer)
--- 248,252 ----
  #		trace("Coloring", start, end, end-start, len(stringVal), styleStart, self.scintilla.SCIGetCharAt(start))
  		scintilla.SCIStartStyling(start, 31)
! 		self.style_buffer = array.array("b", (0,)*len(stringVal))
  		self.ColorizeString(stringVal, styleStart)
  		scintilla.SCISetStylingEx(self.style_buffer)