CVS: anygui/lib/anygui/backends mswgui.py,1.37,1.38
Samuele Pedroni <[email protected]> Wed, 11 Sep 2002 03:28:25 -0700
| 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-serv2155
Modified Files:
mswgui.py
Log Message:
self.widget None now means no widget.
Index: mswgui.py
===================================================================
RCS file: /cvsroot/anygui/anygui/lib/anygui/backends/mswgui.py,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -r1.37 -r1.38
*** mswgui.py 22 Jul 2002 05:44:09 -0000 1.37
--- mswgui.py 11 Sep 2002 10:28:23 -0000 1.38
***************
*** 19,23 ****
from anygui.Utils import log
from anygui.Applications import AbstractApplication
! from anygui.Wrappers import AbstractWrapper, DummyWidget, isDummy
from anygui.Events import *
from anygui import application
--- 19,23 ----
from anygui.Utils import log
from anygui.Applications import AbstractApplication
! from anygui.Wrappers import AbstractWrapper
from anygui.Events import *
from anygui import application
***************
*** 109,143 ****
def setX(self,x):
! if self.noWidget(): return
ox,y,w,h = self.getGeometry()
self.setGeometry(x,y,w,h)
def setY(self,y):
! if self.noWidget(): return
x,oy,w,h = self.getGeometry()
self.setGeometry(x,y,w,h)
def setWidth(self,width):
! if self.noWidget(): return
x,y,ow,h = self.getGeometry()
self.setGeometry(x,y,width,h)
def setHeight(self,height):
! if self.noWidget(): return
x,y,w,oh = self.getGeometry()
self.setGeometry(x,y,w,height)
def setSize(self,width,height):
! if self.noWidget(): return
x,y,w,h = self.getGeometry()
self.setGeometry(x,y,width,height)
def setPosition(self,x,y):
! if self.noWidget(): return
ox,oy,w,h = self.getGeometry()
self.setGeometry(x,y,w,h)
def setGeometry(self,x,y,width,height):
! if self.noWidget(): return
win32gui.SetWindowPos(self.widget,
0,
--- 109,143 ----
def setX(self,x):
! if not self.widget: return
ox,y,w,h = self.getGeometry()
self.setGeometry(x,y,w,h)
def setY(self,y):
! if not self.widget: return
x,oy,w,h = self.getGeometry()
self.setGeometry(x,y,w,h)
def setWidth(self,width):
! if not self.widget: return
x,y,ow,h = self.getGeometry()
self.setGeometry(x,y,width,h)
def setHeight(self,height):
! if not self.widget: return
x,y,w,oh = self.getGeometry()
self.setGeometry(x,y,w,height)
def setSize(self,width,height):
! if not self.widget: return
x,y,w,h = self.getGeometry()
self.setGeometry(x,y,width,height)
def setPosition(self,x,y):
! if not self.widget: return
ox,oy,w,h = self.getGeometry()
self.setGeometry(x,y,w,h)
def setGeometry(self,x,y,width,height):
! if not self.widget: return
win32gui.SetWindowPos(self.widget,
0,
***************
*** 147,151 ****
def setVisible(self,visible):
! if self.noWidget(): return
if visible:
win32gui.ShowWindow(self.widget, win32con.SW_SHOWNORMAL)
--- 147,151 ----
def setVisible(self,visible):
! if not self.widget: return
if visible:
win32gui.ShowWindow(self.widget, win32con.SW_SHOWNORMAL)
***************
*** 154,158 ****
def setEnabled(self,enabled):
! if self.noWidget(): return
if enabled:
win32gui.EnableWindow(self.widget, 1)
--- 154,158 ----
def setEnabled(self,enabled):
! if not self.widget: return
if enabled:
win32gui.EnableWindow(self.widget, 1)
***************
*** 160,164 ****
win32gui.EnableWindow(self.widget, 0)
! def destroy(self):
if self.proxy.container:
try:
--- 160,164 ----
win32gui.EnableWindow(self.widget, 0)
! def destroy(self): # @@@
if self.proxy.container:
try:
***************
*** 166,179 ****
except:
pass
! if not self.noWidget():
try:
win32gui.DestroyWindow(self.widget)
except:
pass
! self.widget = DummyWidget()
def setText(self,text):
! if self.noWidget(): return
win32gui.SetWindowText(self.widget, str(text))
--- 166,179 ----
except:
pass
! if self.widget:
try:
win32gui.DestroyWindow(self.widget)
except:
pass
! self.widget = None
def setText(self,text):
! if not self.widget: return
win32gui.SetWindowText(self.widget, str(text))
***************
*** 189,195 ****
return
parent = container.wrapper.widget
! try:
! assert parent.isDummy()
! except (AttributeError, AssertionError):
self.destroy()
self.create(parent)
--- 189,193 ----
return
parent = container.wrapper.widget
! if parent:
self.destroy()
self.create(parent)
***************
*** 229,233 ****
def getSelection(self):
! if self.noWidget(): return
return win32gui.SendMessage(self.widget,
win32con.LB_GETCURSEL,
--- 227,231 ----
def getSelection(self):
! if not self.widget: return
return win32gui.SendMessage(self.widget,
win32con.LB_GETCURSEL,
***************
*** 236,240 ****
def setItems(self,items):
! if self.noWidget(): return
win32gui.SendMessage(self.widget,
win32con.LB_RESETCONTENT, 0, 0)
--- 234,238 ----
def setItems(self,items):
! if not self.widget: return
win32gui.SendMessage(self.widget,
win32con.LB_RESETCONTENT, 0, 0)
***************
*** 248,252 ****
def setSelection(self,selection):
! if self.noWidget(): return
win32gui.SendMessage(self.widget,
win32con.LB_SETCURSEL,
--- 246,250 ----
def setSelection(self,selection):
! if not self.widget: return
win32gui.SendMessage(self.widget,
win32con.LB_SETCURSEL,
***************
*** 274,278 ****
def setOn(self,on):
! if self.noWidget():
return
if on:
--- 272,276 ----
def setOn(self,on):
! if not self.widget:
return
if on:
***************
*** 354,362 ****
def getText(self):
! if self.noWidget(): return
return self._from_native(win32gui.GetWindowText(self.widget))
def setText(self, text):
! if self.noWidget(): return
if text == self.getText(): return
win32gui.SetWindowText(self.widget, self._to_native(text))
--- 352,360 ----
def getText(self):
! if not self.widget: return
return self._from_native(win32gui.GetWindowText(self.widget))
def setText(self, text):
! if not self.widget: return
if text == self.getText(): return
win32gui.SetWindowText(self.widget, self._to_native(text))
***************
*** 364,368 ****
def getSelection(self):
#log("TextField._backend_selection")
! if self.noWidget(): return
result = win32gui.SendMessage(self.widget,
win32con.EM_GETSEL,
--- 362,366 ----
def getSelection(self):
#log("TextField._backend_selection")
! if not self.widget: return
result = win32gui.SendMessage(self.widget,
win32con.EM_GETSEL,
***************
*** 379,383 ****
def setSelection(self,selection):
#log("TextField._ensure_selection")
! if self.noWidget(): return
start, end = selection
text = self.getText()
--- 377,381 ----
def setSelection(self,selection):
#log("TextField._ensure_selection")
! if not self.widget: return
start, end = selection
text = self.getText()
***************
*** 390,394 ****
def setEditable(self,editable):
! if self.noWidget(): return
if editable:
win32gui.SendMessage(self.widget,
--- 388,392 ----
def setEditable(self,editable):
! if not self.widget: return
if editable:
win32gui.SendMessage(self.widget,
***************
*** 477,481 ****
def setGeometry(self,x,y,width,height):
! if self.noWidget(): return
# take account for title bar and borders
import win32api
--- 475,479 ----
def setGeometry(self,x,y,width,height):
! if not self.widget: return
# take account for title bar and borders
import win32api
***************
*** 493,497 ****
if not application().isRunning(): return
if container is None: return
! if self.noWidget():
self.create()
win32gui.ShowWindow(self.widget, win32con.SW_HIDE)
--- 491,495 ----
if not application().isRunning(): return
if container is None: return
! if not self.widget:
self.create()
win32gui.ShowWindow(self.widget, win32con.SW_HIDE)
***************
*** 503,507 ****
def setTitle(self,title):
! if self.noWidget(): return
win32gui.SetWindowText(self.widget, title)
--- 501,505 ----
def setTitle(self,title):
! if not self.widget: return
win32gui.SetWindowText(self.widget, title)
-------------------------------------------------------
In remembrance
www.osdn.com/911/