CVS: anygui/lib/anygui/backends dwgui.py,1.1,1.2
Robin Becker <[email protected]> Sun, 03 Nov 2002 02:33:50 -0800
| Newsgroups | gmane.comp.python.anygui.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/anygui/anygui/lib/anygui/backends
In directory usw-pr-cvs1:/tmp/cvs-serv4577/lib/anygui/backends
Modified Files:
dwgui.py
Log Message:
Move to anygui log, add proxy push in widgetSetup
Index: dwgui.py
===================================================================
RCS file: /cvsroot/anygui/anygui/lib/anygui/backends/dwgui.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** dwgui.py 3 Nov 2002 00:11:11 -0000 1.1
--- dwgui.py 3 Nov 2002 10:33:47 -0000 1.2
***************
*** 89,96 ****
GetLastError = kernel32.GetLastError
! _verbose=1
if _verbose:
! from rlextra.utils.buildutils import STDLOG
! _stdlog = STDLOG('/tmp/dbg.txt')
def _lastErrorMessage(n=None):
--- 89,96 ----
GetLastError = kernel32.GetLastError
! _verbose=0
if _verbose:
! from anygui.Utils import log, setLogFile
! setLogFile('/tmp/dbg.txt')
def _lastErrorMessage(n=None):
***************
*** 174,178 ****
--- 174,180 ----
def widgetSetUp(self):
+ if _verbose: log('widgetSetup',str(self))
self.proxy.container.wrapper.widget_map[self.widget] = self
+ self.proxy.push(blocked=['container'])
user32.SendMessage(self.widget,
WM_SETFONT,
***************
*** 188,192 ****
h = b-t
! if _verbose: print str(self),'getGeometry',l,t,w,h
try:
p = t_point()
--- 190,194 ----
h = b-t
! if _verbose: log(str(self),'getGeometry',l,t,w,h)
try:
p = t_point()
***************
*** 194,198 ****
user32.ScreenToClient(self.proxy.container.wrapper.widget,p)
l,t = p.point
! if _verbose: print ' -->', l,t,w,h
except AttributeError:
pass
--- 196,200 ----
user32.ScreenToClient(self.proxy.container.wrapper.widget,p)
l,t = p.point
! if _verbose: log(' -->', l,t,w,h)
except AttributeError:
pass
***************
*** 234,238 ****
def setGeometry(self,x,y,width,height):
if self.widget:
! if _verbose: print str(self),'setGeometry', x,y,width,height
user32.SetWindowPos(self.widget, 0, x, y, width, height, SWP_NOACTIVATE | SWP_NOZORDER)
user32.UpdateWindow(self.widget)
--- 236,240 ----
def setGeometry(self,x,y,width,height):
if self.widget:
! if _verbose: log(str(self),'setGeometry', x,y,width,height)
user32.SetWindowPos(self.widget, 0, x, y, width, height, SWP_NOACTIVATE | SWP_NOZORDER)
user32.UpdateWindow(self.widget)
***************
*** 240,244 ****
def setVisible(self,visible):
if self.widget:
! if _verbose: print str(self),'setVisible', visible, self.widget
user32.ShowWindow(self.widget, visible and SW_SHOWNORMAL or SW_HIDE)
--- 242,246 ----
def setVisible(self,visible):
if self.widget:
! if _verbose: log(str(self),'setVisible', visible, self.widget)
user32.ShowWindow(self.widget, visible and SW_SHOWNORMAL or SW_HIDE)
***************
*** 262,266 ****
def setText(self,text):
if not self.widget: return
! if _verbose: print "%s.SetWindowText('%s'(%s)) hwnd=%s(%s) self=%s" % (self.__class__.__name__,text,type(text),self.widget,type(self.widget),self)
self._i_text = windll.cstring(text)
user32.SetWindowTextA(self.widget,self._i_text)
--- 264,268 ----
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),self))
self._i_text = windll.cstring(text)
user32.SetWindowTextA(self.widget,self._i_text)
***************
*** 269,276 ****
if not self.widget: return
n = user32.GetWindowTextLength(self.widget)
! if _verbose: print 'GetWindowText n=',n
t = windll.cstring('',n+1)
r = user32.GetWindowText(self.widget,t.address(),n+1)
! if _verbose: print 'GetWindowText n=%d r=%d s=%s'%(n,r,t.trunc())
return t.trunc()
--- 271,278 ----
if not self.widget: return
n = user32.GetWindowTextLength(self.widget)
! if _verbose: log('GetWindowText n=',n)
t = windll.cstring('',n+1)
r = user32.GetWindowText(self.widget,t.address(),n+1)
! if _verbose: log('GetWindowText n=%d r=%d s=%s'%(n,r,t.trunc()))
return t.trunc()
***************
*** 564,568 ****
def _WM_PAINT(self, hwnd, msg, wParam, lParam):
if not self.widget: return
! if _verbose: print 'in dwImage _WM_PAINT'
r = ComponentWrapper._WM_PAINT(self, hwnd, msg, wParam, lParam)
self.draw()
--- 566,570 ----
def _WM_PAINT(self, hwnd, msg, wParam, lParam):
if not self.widget: return
! if _verbose: log('in dwImage _WM_PAINT')
r = ComponentWrapper._WM_PAINT(self, hwnd, msg, wParam, lParam)
self.draw()
***************
*** 578,582 ****
dc = user32.GetDC(self.widget)
name = windll.cstring('/python/rlextra/distro/demo/RLImage.bmp')
! if _verbose: print 'in draw widget=%s dc=%s dim=%sx%s' % (hex(self.widget),hex(dc),self.proxy.width,self.proxy.height)
try:
bmp=user32.LoadImage(0,name,IMAGE_BITMAP,0,0,LR_DEFAULTSIZE|LR_LOADFROMFILE)
--- 580,584 ----
dc = user32.GetDC(self.widget)
name = windll.cstring('/python/rlextra/distro/demo/RLImage.bmp')
! if _verbose: log('in draw widget=%s dc=%s dim=%sx%s' % (hex(self.widget),hex(dc),self.proxy.width,self.proxy.height))
try:
bmp=user32.LoadImage(0,name,IMAGE_BITMAP,0,0,LR_DEFAULTSIZE|LR_LOADFROMFILE)
***************
*** 585,589 ****
traceback.print_exc()
from anygui.backends.dwgui import _lastErrorMessage
! print _lastErrorMessage()
memdc = gdi32.CreateCompatibleDC(dc)
old = gdi32.SelectObject(memdc,bmp)
--- 587,591 ----
traceback.print_exc()
from anygui.backends.dwgui import _lastErrorMessage
! log(_lastErrorMessage())
memdc = gdi32.CreateCompatibleDC(dc)
old = gdi32.SelectObject(memdc,bmp)
***************
*** 608,617 ****
w = r-l-self._extraWidth
h = b-t-self._extraHeight
! if _verbose: print 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: print 'WindowWrapper: setGeometry',x,y,width,height
# take account for title bar and borders
user32.SetWindowPos(self.widget,
--- 610,619 ----
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',x,y,width,height)
# take account for title bar and borders
user32.SetWindowPos(self.widget,
***************
*** 652,656 ****
def _WM_SIZE(self, hwnd, msg, wParam, lParam):
w, h = lParam & 0xFFFF, lParam >> 16
! if _verbose: print '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
--- 654,658 ----
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
***************
*** 663,667 ****
dw = w - self._width
dh = h - self._height
! if _verbose: print 'dw,dh=',dw,dh
self._width = w
--- 665,669 ----
dw = w - self._width
dh = h - self._height
! if _verbose: log('dw,dh=',dw,dh)
self._width = w
***************
*** 721,729 ****
def _wndproc(self, hwnd, msg, wParam, lParam):
! if _verbose: print "%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: print "\tNO WINDOW TO DISPATCH???"
return user32.DefWindowProc(hwnd, msg, wParam, lParam)
# there should probably be a better way to dispatch messages
--- 723,731 ----
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 user32.DefWindowProc(hwnd, msg, wParam, lParam)
# there should probably be a better way to dispatch messages
***************
*** 733,748 ****
app.internalRemove()
if msg == WM_CLOSE:
! if _verbose: print "\t_WM_COMMAND to %s %s" % (window.__class__.__name__,window)
return window._WM_CLOSE(hwnd, msg, wParam, lParam)
if msg == WM_SIZE:
! if _verbose: print "\t_WM_SIZE to %s %s" % (window.__class__.__name__,window)
return window._WM_SIZE(hwnd, msg, wParam, lParam)
if msg == WM_COMMAND:
! if _verbose: print "\t_WM_COMMAND to %s %s" % (window.__class__.__name__,window)
return window._WM_COMMAND(hwnd, msg, wParam, lParam)
if msg == WM_PAINT:
! if _verbose: print "\t_WM_PAINT to %s %s" % (window.__class__.__name__,window)
return window._WM_PAINT(hwnd, msg, wParam, lParam)
! if _verbose: print "\tDefaultProc() %s %s" % (window.__class__.__name__,window)
return user32.DefWindowProc(hwnd, msg, wParam, lParam)
--- 735,750 ----
app.internalRemove()
if msg == WM_CLOSE:
! if _verbose: log("\t_WM_COMMAND to %s %s" % (window.__class__.__name__,window))
return window._WM_CLOSE(hwnd, msg, wParam, lParam)
if msg == WM_SIZE:
! if _verbose: log("\t_WM_SIZE to %s %s" % (window.__class__.__name__,window))
return window._WM_SIZE(hwnd, msg, wParam, lParam)
if msg == WM_COMMAND:
! if _verbose: log("\t_WM_COMMAND to %s %s" % (window.__class__.__name__,window))
return window._WM_COMMAND(hwnd, msg, wParam, lParam)
if msg == WM_PAINT:
! if _verbose: log("\t_WM_PAINT to %s %s" % (window.__class__.__name__,window))
return window._WM_PAINT(hwnd, msg, wParam, lParam)
! if _verbose: log("\tDefaultProc() %s %s" % (window.__class__.__name__,window))
return user32.DefWindowProc(hwnd, msg, wParam, lParam)
***************
*** 767,771 ****
def internalRemove(self):
if not self._windows:
! if _verbose: print 'PostQuitMessage(0)'
user32.PostQuitMessage(0)
--- 769,773 ----
def internalRemove(self):
if not self._windows:
! if _verbose: log('PostQuitMessage(0)')
user32.PostQuitMessage(0)
-------------------------------------------------------
This SF.net email is sponsored by: ApacheCon, November 18-21 in
Las Vegas (supported by COMDEX), the only Apache event to be
fully supported by the ASF. http://www.apachecon.com