[pywin32-checkins] pywin32/Pythonwin/pywin/Demos toolbar.py, 1.2.4.1, 1.2.4.2

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

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

Modified Files:
      Tag: py3k
	toolbar.py 
Log Message:
Re-integrate various fixes etc implemented during trunk merge.


Index: toolbar.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/Demos/toolbar.py,v
retrieving revision 1.2.4.1
retrieving revision 1.2.4.2
diff -C2 -d -r1.2.4.1 -r1.2.4.2
*** toolbar.py	29 Aug 2008 06:16:06 -0000	1.2.4.1
--- toolbar.py	13 Nov 2008 05:02:23 -0000	1.2.4.2
***************
*** 15,18 ****
--- 15,22 ----
  		self.HookCommand (self.OnPrevious, 401)
  		self.HookCommand (self.OnNext, 402)
+ 		# Its not necessary for us to hook both of these - the
+ 		# common controls should fall-back all by themselves.
+ 		# Indeed, given we hook TTN_NEEDTEXTW, commctrl.TTN_NEEDTEXTA
+ 		# will not be called.
  		self.HookNotify(self.GetTTText, commctrl.TTN_NEEDTEXT)
  		self.HookNotify(self.GetTTText, commctrl.TTN_NEEDTEXTW)
***************
*** 47,51 ****
  			return # Not handled
  		if (idFrom==win32ui.ID_APP_ABOUT):
! 			return 0, ("It Works - in unicode yet!", idFrom, code)
  		return None # not handled.
  			
--- 51,59 ----
  			return # Not handled
  		if (idFrom==win32ui.ID_APP_ABOUT):
! 			# our 'extra' return value needs to be the following
! 			# entries from a NMTTDISPINFO[W] struct:
! 			# (szText, hinst, uFlags).  None means 'don't change
! 			# the value'
! 			return 0, ("It works!", None, None)
  		return None # not handled.