diff options
| author | Jack Jansen <jack.jansen@cwi.nl> | 2001-01-23 14:58:20 (GMT) |
|---|---|---|
| committer | Jack Jansen <jack.jansen@cwi.nl> | 2001-01-23 14:58:20 (GMT) |
| commit | 73023404369dca5216fc81e1fa21d19a03498a3f (patch) | |
| tree | 3c80b0560c8cc0e01a049ab8515a2ed62a69ca41 /Mac/Lib | |
| parent | 43bb2a4f44bb936cf4d950ee23ccd248276f4b07 (diff) | |
| download | cpython-73023404369dca5216fc81e1fa21d19a03498a3f.zip cpython-73023404369dca5216fc81e1fa21d19a03498a3f.tar.gz cpython-73023404369dca5216fc81e1fa21d19a03498a3f.tar.bz2 | |
Sigh... First test before committing. InvalWindowRect and friends are window object methods. Fixed.
Diffstat (limited to 'Mac/Lib')
| -rw-r--r-- | Mac/Lib/FrameWork.py | 17 | ||||
| -rw-r--r-- | Mac/Lib/test/tscrollwin.py | 2 |
2 files changed, 11 insertions, 8 deletions
diff --git a/Mac/Lib/FrameWork.py b/Mac/Lib/FrameWork.py index 733e94e..780ee63 100644 --- a/Mac/Lib/FrameWork.py +++ b/Mac/Lib/FrameWork.py @@ -713,6 +713,9 @@ class Window: def SetPort(self): # Convinience method SetPort(self.wid) + + def GetWindow(self): + return self.wid def do_inDrag(self, partcode, window, event): where = event[3] @@ -753,13 +756,13 @@ class Window: def do_resize(self, width, height, window): l, t, r, b = self.wid.GetWindowPort().portRect # jvr, forGrowIcon self.SetPort() # jvr - InvalWindowRect((r - SCROLLBARWIDTH + 1, b - SCROLLBARWIDTH + 1, r, b)) # jvr + self.wid.InvalWindowRect((r - SCROLLBARWIDTH + 1, b - SCROLLBARWIDTH + 1, r, b)) # jvr window.SizeWindow(width, height, 1) # changed updateFlag to true jvr self.do_postresize(width, height, window) def do_postresize(self, width, height, window): SetPort(window) - InvalWindowRect(window.GetWindowPort().portRect) + self.wid.InvalWindowRect(window.GetWindowPort().portRect) def do_inContent(self, partcode, window, event): # @@ -853,12 +856,12 @@ class ScrolledWindow(ControlsWindow): rect = x0-1, y1-(SCROLLBARWIDTH-1), x1-(SCROLLBARWIDTH-2), y1+1 self.barx = NewControl(self.wid, rect, "", 1, vx, 0, 32767, 16, 0) if not self.barx_enabled: self.barx.HiliteControl(255) -## InvalWindowRect(rect) +## self.wid.InvalWindowRect(rect) if wanty: rect = x1-(SCROLLBARWIDTH-1), y0-1, x1+1, y1-(SCROLLBARWIDTH-2) self.bary = NewControl(self.wid, rect, "", 1, vy, 0, 32767, 16, 0) if not self.bary_enabled: self.bary.HiliteControl(255) -## InvalWindowRect(rect) +## self.wid.InvalWindowRect(rect) def do_postclose(self): self.barx = self.bary = None @@ -893,11 +896,11 @@ class ScrolledWindow(ControlsWindow): self.bary.SizeControl(SCROLLBARWIDTH, (b-t)-(SCROLLBARWIDTH-3)) # jvr if self.barx: self.barx.ShowControl() # jvr - ValidWindowRect((l, b - SCROLLBARWIDTH + 1, r - SCROLLBARWIDTH + 2, b)) # jvr + self.wid.ValidWindowRect((l, b - SCROLLBARWIDTH + 1, r - SCROLLBARWIDTH + 2, b)) # jvr if self.bary: self.bary.ShowControl() # jvr - ValidWindowRect((r - SCROLLBARWIDTH + 1, t, r, b - SCROLLBARWIDTH + 2)) # jvr - InvalWindowRect((r - SCROLLBARWIDTH + 1, b - SCROLLBARWIDTH + 1, r, b)) # jvr, growicon + self.wid.ValidWindowRect((r - SCROLLBARWIDTH + 1, t, r, b - SCROLLBARWIDTH + 2)) # jvr + self.wid.InvalWindowRect((r - SCROLLBARWIDTH + 1, b - SCROLLBARWIDTH + 1, r, b)) # jvr, growicon def do_rawcontrolhit(self, window, control, pcode, local, event): diff --git a/Mac/Lib/test/tscrollwin.py b/Mac/Lib/test/tscrollwin.py index d91f6b9..661ad2b 100644 --- a/Mac/Lib/test/tscrollwin.py +++ b/Mac/Lib/test/tscrollwin.py @@ -47,7 +47,7 @@ class MyWindow(ScrolledWindow): self.vy = value else: self.vy = self.vy + delta - Win.InvalWindowRect(self.ourrect) + self.wid.InvalWindowRect(self.ourrect) def do_update(self, wid, event): Qd.EraseRect(self.ourrect) |