Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/Demos
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25507/Pythonwin/pywin/Demos
Modified Files:
toolbar.py
Log Message:
Lots of stuff from Roger's work on the py3k branch:
* Lots of string and 64bit enhancements, particularly
in pythonwin which only accepted plain string objects
in many cases. pywintypes and some of the other extension
code get cleanups in this area too.
* Consolidation of more structure conversions and other helpers
into pywintypes.
* Additional pythonwin tooltip notification fixes.
* Some '#if (PY_VERSION_HEX < 0x03000000)' blocks have been
incorporated, but in general, no py3k specific code has
been merged yet.
* Better error handling in pythonwin; less exceptions should be
left lingering, be overridden or simply ignored.
* Drop support for pythoncom.__future_currency__ - the
decimal module is now always used.
* A couple of very early interface implementations are upgraded to have
unicode passed instead of strings - if you *implement* (not use) any
of these interfaces, you may need to test to ensure you work when
args are passed as unicode objects instead of strings. Affected are
IErrorLog, IPropertyBag, ICatInformation and IStorage.
Index: toolbar.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/Demos/toolbar.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** toolbar.py 5 Mar 2005 03:15:25 -0000 1.2
--- toolbar.py 13 Nov 2008 04:04:50 -0000 1.3
***************
*** 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!", 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.
|
