[pywin32-checkins] pywin32/Pythonwin/pywin/scintilla document.py, 1.6, 1.7

[Roger U. <ru...@us...>]

Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/scintilla
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6305

Modified Files:
	document.py 
Log Message:
Remove import *

Index: document.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/scintilla/document.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** document.py	29 Oct 2000 23:44:42 -0000	1.6
--- document.py	2 Sep 2008 19:52:33 -0000	1.7
***************
*** 2,6 ****
  from pywin.mfc import docview
  from pywin import is_platform_unicode, default_platform_encoding, default_scintilla_encoding
! from scintillacon import *
  import win32con
  import string
--- 2,6 ----
  from pywin.mfc import docview
  from pywin import is_platform_unicode, default_platform_encoding, default_scintilla_encoding
! import scintillacon
  import win32con
  import string
***************
*** 58,69 ****
  		if view.IsWindow():
  			# Turn off undo collection while loading 
! 			view.SendScintilla(SCI_SETUNDOCOLLECTION, 0, 0)
  			# Make sure the control isnt read-only
  			view.SetReadOnly(0)
  
  			doc = self
! 			view.SendScintilla(SCI_CLEARALL)
! 			view.SendMessage(SCI_ADDTEXT, buffer(text))
! 			view.SendScintilla(SCI_SETUNDOCOLLECTION, 1, 0)
  			view.SendScintilla(win32con.EM_EMPTYUNDOBUFFER, 0, 0)
  
--- 58,69 ----
  		if view.IsWindow():
  			# Turn off undo collection while loading 
! 			view.SendScintilla(scintillacon.SCI_SETUNDOCOLLECTION, 0, 0)
  			# Make sure the control isnt read-only
  			view.SetReadOnly(0)
  
  			doc = self
! 			view.SendScintilla(scintillacon.SCI_CLEARALL)
! 			view.SendMessage(scintillacon.SCI_ADDTEXT, buffer(text))
! 			view.SendScintilla(scintillacon.SCI_SETUNDOCOLLECTION, 1, 0)
  			view.SendScintilla(win32con.EM_EMPTYUNDOBUFFER, 0, 0)
  
***************
*** 73,83 ****
  	def HookViewNotifications(self, view):
  		parent = view.GetParentFrame()
! 		parent.HookNotify(ViewNotifyDelegate(self, "OnBraceMatch"), SCN_CHECKBRACE)
! 		parent.HookNotify(ViewNotifyDelegate(self, "OnMarginClick"), SCN_MARGINCLICK)
! 		parent.HookNotify(ViewNotifyDelegate(self, "OnNeedShown"), SCN_NEEDSHOWN)
  
! 		parent.HookNotify(DocumentNotifyDelegate(self, "OnSavePointReached"), SCN_SAVEPOINTREACHED)
! 		parent.HookNotify(DocumentNotifyDelegate(self, "OnSavePointLeft"), SCN_SAVEPOINTLEFT)
! 		parent.HookNotify(DocumentNotifyDelegate(self, "OnModifyAttemptRO"), SCN_MODIFYATTEMPTRO)
  		# Tell scintilla what characters should abort auto-complete.
  		view.SCIAutoCStops(string.whitespace+"()[]:;+-/*=\\?'!#@$%^&,<>\"'|" )
--- 73,83 ----
  	def HookViewNotifications(self, view):
  		parent = view.GetParentFrame()
! 		parent.HookNotify(ViewNotifyDelegate(self, "OnBraceMatch"), scintillacon.SCN_CHECKBRACE)
! 		parent.HookNotify(ViewNotifyDelegate(self, "OnMarginClick"), scintillacon.SCN_MARGINCLICK)
! 		parent.HookNotify(ViewNotifyDelegate(self, "OnNeedShown"), scintillacon.SCN_NEEDSHOWN)
  
! 		parent.HookNotify(DocumentNotifyDelegate(self, "OnSavePointReached"), scintillacon.SCN_SAVEPOINTREACHED)
! 		parent.HookNotify(DocumentNotifyDelegate(self, "OnSavePointLeft"), scintillacon.SCN_SAVEPOINTLEFT)
! 		parent.HookNotify(DocumentNotifyDelegate(self, "OnModifyAttemptRO"), scintillacon.SCN_MODIFYATTEMPTRO)
  		# Tell scintilla what characters should abort auto-complete.
  		view.SCIAutoCStops(string.whitespace+"()[]:;+-/*=\\?'!#@$%^&,<>\"'|" )