[Wnd-commit] wnd/wnd/controls/treeview header.py,1.1.1.1,1.2 messagehandler.py,1.3,1.4 methods.py,1.
Status: Alpha
Brought to you by:
jurner
|
From: jürgen u. <cer...@us...> - 2005-07-02 09:56:21
|
Update of /cvsroot/wnd/wnd/wnd/controls/treeview In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24985 Modified Files: header.py messagehandler.py methods.py Log Message: bit of this and a bit of that Index: methods.py =================================================================== RCS file: /cvsroot/wnd/wnd/wnd/controls/treeview/methods.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** methods.py 15 May 2005 09:38:30 -0000 1.2 --- methods.py 2 Jul 2005 09:56:12 -0000 1.3 *************** *** 461,465 **** self.Msg.TVM_GETEDITCONTROL, 0, 0) if not hwndEdit: raise RuntimeError("could not retrieve edit control") ! return TextinFromHandle(hwndEdit, 'nosubclass') def EditLabel(self, handle): --- 461,468 ---- self.Msg.TVM_GETEDITCONTROL, 0, 0) if not hwndEdit: raise RuntimeError("could not retrieve edit control") ! txt= TextinFromHandle(hwndEdit) ! fw.SetFlagMsgReflect(txt, False) ! return txt ! def EditLabel(self, handle): *************** *** 467,476 **** raise RuntimeError("could not edit label") def ItemHittest(self, x, y): hi=TVHITTESTINFO() ! hi.pt.x, hi.pt.y=x, y result= self.SendMessage(self.Hwnd, self.Msg.TVM_HITTEST, 0, byref(hi)) ! TVHT_NOWHERE = 1 ! out=[] if hi.flags& 1: out.append('nowhere') if hi.flags& 2: out.append('onitemicon') --- 470,484 ---- raise RuntimeError("could not edit label") + def EndEditLabel(self, cancel=False): + return bool(self.SendMessage(self.Hwnd, self.Msg.TVM_ENDEDITLABELNOW, save and 1 or 0, 0)) + def ItemHittest(self, x, y): hi=TVHITTESTINFO() ! pt = POINT(x, y) ! user32.ScreenToClient(self.Hwnd, byref(pt)) ! hi.pt= pt result= self.SendMessage(self.Hwnd, self.Msg.TVM_HITTEST, 0, byref(hi)) ! #TVHT_NOWHERE = 1 ! out=[hi.hItem, ] if hi.flags& 1: out.append('nowhere') if hi.flags& 2: out.append('onitemicon') *************** *** 485,489 **** if hi.flags& 2048: out.append('toleft') if hi.flags& (TVHT_ONITEMICON | TVHT_ONITEMLABEL | TVHT_ONITEMSTATEICON): out.append('onitem') ! return (hi.hItem, out) --- 493,498 ---- if hi.flags& 2048: out.append('toleft') if hi.flags& (TVHT_ONITEMICON | TVHT_ONITEMLABEL | TVHT_ONITEMSTATEICON): out.append('onitem') ! return out ! Index: header.py =================================================================== RCS file: /cvsroot/wnd/wnd/wnd/controls/treeview/header.py,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** header.py 29 Apr 2005 15:22:52 -0000 1.1.1.1 --- header.py 2 Jul 2005 09:56:12 -0000 1.2 *************** *** 2,6 **** ! from wnd.wintypes import (Structure, WINFUNCTYPE, sizeof, --- 2,7 ---- ! from wnd.wintypes import (user32, ! Structure, WINFUNCTYPE, sizeof, *************** *** 143,148 **** TVS_NOHSCROLL = 32768 # TVS_NOSCROLL overrides this ! WS_CLIENT_CUSTOMDRAW = 1 ! Styles.__dict__.update(control.control_styles.__dict__) Styles.prefix += ['TVS_', ] --- 144,148 ---- TVS_NOHSCROLL = 32768 # TVS_NOSCROLL overrides this ! Styles.__dict__.update(control.control_styles.__dict__) Styles.prefix += ['TVS_', ] Index: messagehandler.py =================================================================== RCS file: /cvsroot/wnd/wnd/wnd/controls/treeview/messagehandler.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** messagehandler.py 17 May 2005 20:14:12 -0000 1.3 --- messagehandler.py 2 Jul 2005 09:56:12 -0000 1.4 *************** *** 27,31 **** if wp==fw.WND_NM_MSGREFLECT: msgr= fw.WND_MSGREFLECT.from_address(lp) ! msgr.fReturn= 1 nm=NMTREEVIEW.from_address(msgr.lParam) --- 27,31 ---- if wp==fw.WND_NM_MSGREFLECT: msgr= fw.WND_MSGREFLECT.from_address(lp) ! msgr.fReturn= self._base_fMsgReflect nm=NMTREEVIEW.from_address(msgr.lParam) |