CVS: anygui/lib/anygui/backends ctmswgui.py,1.5,1.6
Robin Becker <[email protected]> Tue, 19 Nov 2002 04:41:46 -0800
| Newsgroups | gmane.comp.python.anygui.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/anygui/anygui/lib/anygui/backends
In directory sc8-pr-cvs1:/tmp/cvs-serv1722
Modified Files:
ctmswgui.py
Log Message:
Comment debugging code
Index: ctmswgui.py
===================================================================
RCS file: /cvsroot/anygui/anygui/lib/anygui/backends/ctmswgui.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** ctmswgui.py 15 Nov 2002 18:50:08 -0000 1.5
--- ctmswgui.py 19 Nov 2002 12:41:44 -0000 1.6
***************
*** 23,27 ****
from anygui.Events import *
from anygui import application
! from anygui.Utils import log, setLogFile, logTraceback
################################################################
--- 23,27 ----
from anygui.Events import *
from anygui import application
! from anygui.Utils import log, setLogFile
################################################################
***************
*** 36,40 ****
class WinDLL(CDLL):
!
def __getattr__(self, name):
try:
--- 36,40 ----
class WinDLL(CDLL):
!
def __getattr__(self, name):
try:
***************
*** 208,214 ****
PBM_SETRANGE=WM_USER+1
! _verbose=0
! if _verbose:
! setLogFile('/tmp/dbg.txt')
class t_rect(Structure):
--- 208,214 ----
PBM_SETRANGE=WM_USER+1
! #_verbose=0
! #if _verbose:
! # setLogFile('/tmp/dbg.txt')
class t_rect(Structure):
***************
*** 264,268 ****
def widgetSetUp(self):
! if _verbose: log('widgetSetup',str(self))
self.proxy.container.wrapper.widget_map[self.widget] = self
SendMessage(self.widget,
--- 264,268 ----
def widgetSetUp(self):
! #if _verbose: log('widgetSetup',str(self))
self.proxy.container.wrapper.widget_map[self.widget] = self
SendMessage(self.widget,
***************
*** 273,277 ****
def internalProd(self):
! if _verbose: log('internalProd',str(self))
self.proxy.push(blocked=['container'])
--- 273,277 ----
def internalProd(self):
! #if _verbose: log('internalProd',str(self))
self.proxy.push(blocked=['container'])
***************
*** 284,288 ****
h = b-t
! if _verbose: log(str(self),'getGeometry',l,t,w,h)
try:
p = t_point()
--- 284,288 ----
h = b-t
! #if _verbose: log(str(self),'getGeometry',l,t,w,h)
try:
p = t_point()
***************
*** 290,298 ****
ScreenToClient(self.proxy.container.wrapper.widget,byref(p))
l,t = p.x, p.y
! if _verbose: log(' -->', l,t,w,h)
except AttributeError:
pass
- except:
- logTraceback(None)
return l,t,w,h
--- 290,296 ----
ScreenToClient(self.proxy.container.wrapper.widget,byref(p))
l,t = p.x, p.y
! #if _verbose: log(' -->', l,t,w,h)
except AttributeError:
pass
return l,t,w,h
***************
*** 329,333 ****
def setGeometry(self,x,y,width,height):
if self.widget:
! if _verbose: log(str(self),'setGeometry', x,y,width,height)
SetWindowPos(self.widget, 0, x, y, width, height, SWP_NOACTIVATE | SWP_NOZORDER)
UpdateWindow(self.widget)
--- 327,331 ----
def setGeometry(self,x,y,width,height):
if self.widget:
! #if _verbose: log(str(self),'setGeometry', x,y,width,height)
SetWindowPos(self.widget, 0, x, y, width, height, SWP_NOACTIVATE | SWP_NOZORDER)
UpdateWindow(self.widget)
***************
*** 335,339 ****
def setVisible(self,visible):
if self.widget:
! if _verbose: log(str(self),'setVisible', visible, self.widget)
ShowWindow(self.widget, visible and SW_SHOWNORMAL or SW_HIDE)
--- 333,337 ----
def setVisible(self,visible):
if self.widget:
! #if _verbose: log(str(self),'setVisible', visible, self.widget)
ShowWindow(self.widget, visible and SW_SHOWNORMAL or SW_HIDE)
***************
*** 357,361 ****
def setText(self,text):
if not self.widget: return
! if _verbose: log("%s.SetWindowText('%s'(%s)) hwnd=%s(%s) self=%s" % (self.__class__.__name__,text,type(text),self.widget,type(self.widget),str(self)))
SetWindowText(self.widget,c_string(_to_native(text)))
--- 355,359 ----
def setText(self,text):
if not self.widget: return
! #if _verbose: log("%s.SetWindowText('%s'(%s)) hwnd=%s(%s) self=%s" % (self.__class__.__name__,text,type(text),self.widget,type(self.widget),str(self)))
SetWindowText(self.widget,c_string(_to_native(text)))
***************
*** 551,555 ****
def _WM_COMMAND(self, hwnd, msg, wParam, lParam):
! if _verbose: log("ContainerMixin _WM_COMMAND called for %s"%self)
# lParam: handle of control (or NULL, if not from a control)
# HIWORD(wParam): notification code
--- 549,553 ----
def _WM_COMMAND(self, hwnd, msg, wParam, lParam):
! #if _verbose: log("ContainerMixin _WM_COMMAND called for %s"%self)
# lParam: handle of control (or NULL, if not from a control)
# HIWORD(wParam): notification code
***************
*** 559,571 ****
child_window = self.widget_map[lParam]
except KeyError:
! if _verbose: log("NO SUCH CHILD WINDOW %s"%lParam)
# we receive (when running test_textfield.py)
# EN_CHANGE (0x300) and EN_UPDATE (0x400) notifications
# here even before the call to CreateWindow returns.
return -1
! except:
! logTraceback(None)
! return -1
! if _verbose: log("Dispatching to child %s"%child_window)
return child_window._WM_COMMAND(hwnd, msg, wParam, lParam)
--- 557,566 ----
child_window = self.widget_map[lParam]
except KeyError:
! #if _verbose: log("NO SUCH CHILD WINDOW %s"%lParam)
# we receive (when running test_textfield.py)
# EN_CHANGE (0x300) and EN_UPDATE (0x400) notifications
# here even before the call to CreateWindow returns.
return -1
! #if _verbose: log("Dispatching to child %s"%child_window)
return child_window._WM_COMMAND(hwnd, msg, wParam, lParam)
***************
*** 613,618 ****
IMAGE_BITMAP,0,0,LR_DEFAULTSIZE|LR_LOADFROMFILE)
except:
- logTraceback(None)
log(WinError())
def handle(self):
--- 608,613 ----
IMAGE_BITMAP,0,0,LR_DEFAULTSIZE|LR_LOADFROMFILE)
except:
log(WinError())
+ raise
def handle(self):
***************
*** 621,625 ****
import zlib, base64, tempfile, os
fn = tempfile.mktemp(self.suffix)
! if _verbose: log('resource:','fn',fn,'kind',self.kind)
open(fn,'wb').write(zlib.decompress(base64.decodestring(self.text)))
try:
--- 616,620 ----
import zlib, base64, tempfile, os
fn = tempfile.mktemp(self.suffix)
! #if _verbose: log('resource:','fn',fn,'kind',self.kind)
open(fn,'wb').write(zlib.decompress(base64.decodestring(self.text)))
try:
***************
*** 629,633 ****
else:
self._fn2handle(self.text)
! if _verbose: log('resource:','-->',self._handle)
return self._handle
--- 624,628 ----
else:
self._fn2handle(self.text)
! #if _verbose: log('resource:','-->',self._handle)
return self._handle
***************
*** 647,651 ****
def _WM_PAINT(self, hwnd, msg, wParam, lParam):
if not self.widget: return -1
! if _verbose: log('Image _WM_PAINT self.__dict__',self.__dict__)
r = ComponentWrapper._WM_PAINT(self, hwnd, msg, wParam, lParam)
self.draw()
--- 642,646 ----
def _WM_PAINT(self, hwnd, msg, wParam, lParam):
if not self.widget: return -1
! #if _verbose: log('Image _WM_PAINT self.__dict__',self.__dict__)
r = ComponentWrapper._WM_PAINT(self, hwnd, msg, wParam, lParam)
self.draw()
***************
*** 653,661 ****
def draw(self,*arg,**kw):
! if _verbose: log('Image.draw',self.widget,self._image)
if not self.widget or not self._image: return
dc = GetDC(self.widget)
memdc = gdi32.CreateCompatibleDC(dc)
! if _verbose: log('Image.draw dc, memdc',dc,memdc)
old = gdi32.SelectObject(memdc,self._image.handle())
gdi32.BitBlt(dc,0,0,self.proxy.width,self.proxy.height,memdc,0,0,0x00CC0020)
--- 648,656 ----
def draw(self,*arg,**kw):
! #if _verbose: log('Image.draw',self.widget,self._image)
if not self.widget or not self._image: return
dc = GetDC(self.widget)
memdc = gdi32.CreateCompatibleDC(dc)
! #if _verbose: log('Image.draw dc, memdc',dc,memdc)
old = gdi32.SelectObject(memdc,self._image.handle())
gdi32.BitBlt(dc,0,0,self.proxy.width,self.proxy.height,memdc,0,0,0x00CC0020)
***************
*** 689,698 ****
w = r-l-self._extraWidth
h = b-t-self._extraHeight
! if _verbose: log(str(self),'getGeometry WindowWrapper:', l,t,w,h)
return l,t,w,h
def setGeometry(self,x,y,width,height):
if not self.widget: return
! if _verbose: log('WindowWrapper: setGeometry',str(self),self.widget,x,y,width,height,self._extraWidth,self._extraHeight)
# take account for title bar and borders
SetWindowPos(self.widget,
--- 684,693 ----
w = r-l-self._extraWidth
h = b-t-self._extraHeight
! #if _verbose: log(str(self),'getGeometry WindowWrapper:', l,t,w,h)
return l,t,w,h
def setGeometry(self,x,y,width,height):
if not self.widget: return
! #if _verbose: log('WindowWrapper: setGeometry',str(self),self.widget,x,y,width,height,self._extraWidth,self._extraHeight)
# take account for title bar and borders
SetWindowPos(self.widget,
***************
*** 725,739 ****
def widgetSetUp(self):
! if _verbose: log('Windowwrapper widgetSetup',str(self),'application()',application(),'isRunning()',application().isRunning(),'widget',getattr(self,'widget',None))
application().widget_map[self.widget] = self
SendMessage(self.widget, WM_SETFONT, self._hfont, 0)
def internalProd(self):
! if _verbose: log('internalProd',str(self))
self.proxy.push(blocked=['container'])
def _WM_SIZE(self, hwnd, msg, wParam, lParam):
w, h = lParam & 0xFFFF, lParam >> 16
! if _verbose: log('WindowWrapper: _WM_SIZE _width,_height,w,h=',self._width,self._height,w,h,)
if self._width==0 and self._height==0:
# This will be the case when the widget is first
--- 720,734 ----
def widgetSetUp(self):
! #if _verbose: log('Windowwrapper widgetSetup',str(self),'application()',application(),'isRunning()',application().isRunning(),'widget',getattr(self,'widget',None))
application().widget_map[self.widget] = self
SendMessage(self.widget, WM_SETFONT, self._hfont, 0)
def internalProd(self):
! #if _verbose: log('internalProd',str(self))
self.proxy.push(blocked=['container'])
def _WM_SIZE(self, hwnd, msg, wParam, lParam):
w, h = lParam & 0xFFFF, lParam >> 16
! #if _verbose: log('WindowWrapper: _WM_SIZE _width,_height,w,h=',self._width,self._height,w,h,)
if self._width==0 and self._height==0:
# This will be the case when the widget is first
***************
*** 746,750 ****
dw = w - self._width
dh = h - self._height
! if _verbose: log('dw,dh=',dw,dh)
self._width = w
--- 741,745 ----
dw = w - self._width
dh = h - self._height
! #if _verbose: log('dw,dh=',dw,dh)
self._width = w
***************
*** 759,763 ****
def _WM_COMMAND(self, hwnd, msg, wParam, lParam):
! if _verbose: log('WindowWrapper: _WM_COMMAND',str(self),hwnd,msg,wParam,lParam)
return ContainerMixin._WM_COMMAND(self, hwnd, msg, wParam, lParam)
--- 754,758 ----
def _WM_COMMAND(self, hwnd, msg, wParam, lParam):
! #if _verbose: log('WindowWrapper: _WM_COMMAND',str(self),hwnd,msg,wParam,lParam)
return ContainerMixin._WM_COMMAND(self, hwnd, msg, wParam, lParam)
***************
*** 799,803 ****
global _app
if not _app:
! if _verbose: log('Application.__init__:start',str(self))
AbstractApplication.__init__(self)
if not self._wndclass: self._register_class()
--- 794,798 ----
global _app
if not _app:
! #if _verbose: log('Application.__init__:start',str(self))
AbstractApplication.__init__(self)
if not self._wndclass: self._register_class()
***************
*** 805,809 ****
FrameWrapper._wndclass = self._wndclass
_app = self
! if _verbose: log('Application.__init__:end',str(self))
def __str__(self):
--- 800,804 ----
FrameWrapper._wndclass = self._wndclass
_app = self
! #if _verbose: log('Application.__init__:end',str(self))
def __str__(self):
***************
*** 814,818 ****
def _register_class(self):
! if _verbose: log('Application._register_class:start',str(self))
class WINDOWPROC(CFunction):
_types_ = "iiii"
--- 809,813 ----
def _register_class(self):
! #if _verbose: log('Application._register_class:start',str(self))
class WINDOWPROC(CFunction):
_types_ = "iiii"
***************
*** 847,871 ****
self.__class__._wndclass = RegisterClass(byref(wc))
## assert self.__class__._wndclass, "RegisterClass --> %s" % WinError()
! if _verbose: log('Application._register_class:end',str(self))
def _wndproc(self, hwnd, msg, wParam, lParam):
! if _verbose: log("%s._wndproc called with %s,%s,%s,%s"%(self.__class__.__name__,hex(hwnd),hex(msg),hex(wParam),hex(lParam)))
try:
window = self.widget_map[hwnd]
except:
! if _verbose: log("\tNO WINDOW TO DISPATCH???")
return DefWindowProc(hwnd, msg, wParam, lParam)
! try:
! _dispatch = self._dispatch.get(msg,_dispatch_DEFAULT)
! x = _dispatch(window,hwnd,msg,wParam,lParam)
! except:
! if _verbose: logTraceback(None,'_wndproc.1')
! x = -1
! if _verbose: log("\tdispatch %s to %s %s\n" % (_dispatch.__name__[9:],window.__class__.__name__,window),"\t ==>",x)
return x
def internalRun(self):
! if _verbose: log('internalRun:Begin',str(self))
class MSG(Structure):
_fields_ = (
--- 842,862 ----
self.__class__._wndclass = RegisterClass(byref(wc))
## assert self.__class__._wndclass, "RegisterClass --> %s" % WinError()
! #if _verbose: log('Application._register_class:end',str(self))
def _wndproc(self, hwnd, msg, wParam, lParam):
! #if _verbose: log("%s._wndproc called with %s,%s,%s,%s"%(self.__class__.__name__,hex(hwnd),hex(msg),hex(wParam),hex(lParam)))
try:
window = self.widget_map[hwnd]
except:
! #if _verbose: log("\tNO WINDOW TO DISPATCH???")
return DefWindowProc(hwnd, msg, wParam, lParam)
! _dispatch = self._dispatch.get(msg,_dispatch_DEFAULT)
! x = _dispatch(window,hwnd,msg,wParam,lParam)
! #if _verbose: log("\tdispatch %s to %s %s\n" % (_dispatch.__name__[9:],window.__class__.__name__,window),"\t ==>",x)
return x
def internalRun(self):
! #if _verbose: log('internalRun:Begin',str(self))
class MSG(Structure):
_fields_ = (
***************
*** 881,930 ****
msg = MSG()
while GetMessage(byref(msg), 0, 0, 0):
! try:
! if _verbose: log('internalRun: loopstart',msg)
! TranslateMessage(byref(msg))
! DispatchMessage(byref(msg))
! if _verbose: log('internalRun: loopend')
! except:
! logTraceback(None)
! if _verbose: log('internalRun: finish')
def internalRemove(self):
if not self._windows:
! if _verbose: log('PostQuitMessage(0)')
PostQuitMessage(0)
global _app
_app = None
! if 1 and _verbose:
! n = 0
! from inspect import isclass, ismethod, getmembers
! def makeTBWrap(C,methodname):
! import new
! global n
! oldmethodname = '_%d_tbWrap_%s' % (n,methodname)
! oldmethod = getattr(C,methodname)
! S = []
! s = S.append
! s('def %s(self,*A,**K):' % methodname)
! s('\ttry:')
! s('\t\treturn self.%s(*A,**K)' % oldmethodname)
! s('\texcept:')
! s('\t\tfrom anygui.Utils import logTraceback')
! s('\t\tlogTraceback(None,\'[%s.%s]\')' % (C.__name__,methodname))
! s('\t\traise')
! s('setattr(C,oldmethodname,oldmethod)')
! s('setattr(C,methodname,new.instancemethod(%s,None,C))' % methodname)
! exec '\n'.join(S) + '\n' in locals()
! n += 1
!
! for a in __all__:
! C = globals()[a]
! if isclass(C):
! M = []
! m = M.append
! for methodname,method in getmembers(C):
! if ismethod(method): m(methodname)
! for methodname in M: makeTBWrap(C,methodname)
################################################################
--- 872,897 ----
msg = MSG()
while GetMessage(byref(msg), 0, 0, 0):
! TranslateMessage(byref(msg))
! DispatchMessage(byref(msg))
! #if _verbose: log('internalRun: finish')
def internalRemove(self):
if not self._windows:
! #if _verbose: log('PostQuitMessage(0)')
PostQuitMessage(0)
global _app
_app = None
! #if 1 and _verbose:
! # try:
! # import tbwrap
! # from inspect import isclass
! # from anygui.Utils import _logger
! # for a in __all__:
! # C = globals()[a]
! # if isclass(C):
! # tbwrap.tracebackWrap(C,out=_logger._f)
! # except ImportError:
! # pass
################################################################
-------------------------------------------------------
This sf.net email is sponsored by: To learn the basics of securing
your web site with SSL, click here to get a FREE TRIAL of a Thawte
Server Certificate: http://www.gothawte.com/rd524.html