mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replaced InvalRect and friends with the Carbon-compliant InvalWindowRect.

This commit is contained in:
Jack Jansen 2001-01-23 14:34:49 +00:00
parent f79cb2db3e
commit d829e9e8e3
15 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Mac/Demo/PICTbrowse/oldPICTbrowse.py
View File

@ -24,7 +24,7 @@ def main():
dummy = Res.GetResource('DLOG', ID_MAIN) dummy = Res.GetResource('DLOG', ID_MAIN)
except Res.Error: except Res.Error:
try: try:
Res.OpenResFile("oldPICTbrowse.rsrc") Res.FSpOpenResFile("oldPICTbrowse.rsrc", 0)
except Res.Error, arg: except Res.Error, arg:
EasyDialogs.Message("Cannot open PICTbrowse.rsrc: "+arg[1]) EasyDialogs.Message("Cannot open PICTbrowse.rsrc: "+arg[1])
sys.exit(1) sys.exit(1)

4
Mac/Demo/waste/htmled.py
View File

@ -194,7 +194,7 @@ def do_postresize(self, width, height, window):
l, t, r, b = self.ted.WEGetViewRect() l, t, r, b = self.ted.WEGetViewRect()
vr = (l, t, l+width-15, t+height-15) vr = (l, t, l+width-15, t+height-15)
self.ted.WESetViewRect(vr) self.ted.WESetViewRect(vr)
Win.InvalRect(vr) Win.InvalWindowRect(vr)
ScrolledWindow.do_postresize(self, width, height, window) ScrolledWindow.do_postresize(self, width, height, window)
def do_contentclick(self, local, modifiers, evt): def do_contentclick(self, local, modifiers, evt):
@ -290,7 +290,7 @@ def menu_insert_html(self, fp):
self.ted.WESetSelection(start, end) self.ted.WESetSelection(start, end)
self.ted.WESelView() self.ted.WESelView()
self.ted.WEFeatureFlag(WASTEconst.weFInhibitRecal, 0) self.ted.WEFeatureFlag(WASTEconst.weFInhibitRecal, 0)
Win.InvalRect(self.ted.WEGetViewRect()) Win.InvalWindowRect(self.ted.WEGetViewRect())
self.updatescrollbars() self.updatescrollbars()
self.parent.updatemenubar() self.parent.updatemenubar()

2
Mac/Demo/waste/swed.py
View File

@ -163,7 +163,7 @@ def do_postresize(self, width, height, window):
l, t, r, b = self.ted.WEGetViewRect() l, t, r, b = self.ted.WEGetViewRect()
vr = (l, t, l+width-15, t+height-15) vr = (l, t, l+width-15, t+height-15)
self.ted.WESetViewRect(vr) self.ted.WESetViewRect(vr)
Win.InvalRect(vr) Win.InvalWindowRect(vr)
ScrolledWindow.do_postresize(self, width, height, window) ScrolledWindow.do_postresize(self, width, height, window)
def do_contentclick(self, local, modifiers, evt): def do_contentclick(self, local, modifiers, evt):

2
Mac/Demo/waste/wed.py
View File

@ -136,7 +136,7 @@ def do_postresize(self, width, height, window):
l, t, r, b = self.ted.WEGetViewRect() l, t, r, b = self.ted.WEGetViewRect()
vr = (l, t, l+width-15, t+height-15) vr = (l, t, l+width-15, t+height-15)
self.ted.WESetViewRect(vr) self.ted.WESetViewRect(vr)
Win.InvalRect(vr) Win.InvalWindowRect(vr)
ScrolledWindow.do_postresize(self, width, height, window) ScrolledWindow.do_postresize(self, width, height, window)
def do_contentclick(self, local, modifiers, evt): def do_contentclick(self, local, modifiers, evt):

14
Mac/Lib/FrameWork.py
View File

@ -753,13 +753,13 @@ def do_inGrow(self, partcode, window, event):
def do_resize(self, width, height, window): def do_resize(self, width, height, window):
l, t, r, b = self.wid.GetWindowPort().portRect # jvr, forGrowIcon l, t, r, b = self.wid.GetWindowPort().portRect # jvr, forGrowIcon
self.SetPort() # jvr self.SetPort() # jvr
InvalRect((r - SCROLLBARWIDTH + 1, b - SCROLLBARWIDTH + 1, r, b)) # jvr InvalWindowRect((r - SCROLLBARWIDTH + 1, b - SCROLLBARWIDTH + 1, r, b)) # jvr
window.SizeWindow(width, height, 1) # changed updateFlag to true jvr window.SizeWindow(width, height, 1) # changed updateFlag to true jvr
self.do_postresize(width, height, window) self.do_postresize(width, height, window)
def do_postresize(self, width, height, window): def do_postresize(self, width, height, window):
SetPort(window) SetPort(window)
InvalRect(window.GetWindowPort().portRect) InvalWindowRect(window.GetWindowPort().portRect)
def do_inContent(self, partcode, window, event): def do_inContent(self, partcode, window, event):
# #
@ -853,12 +853,12 @@ def scrollbars(self, wantx=1, wanty=1):
rect = x0-1, y1-(SCROLLBARWIDTH-1), x1-(SCROLLBARWIDTH-2), y1+1 rect = x0-1, y1-(SCROLLBARWIDTH-1), x1-(SCROLLBARWIDTH-2), y1+1
self.barx = NewControl(self.wid, rect, "", 1, vx, 0, 32767, 16, 0) self.barx = NewControl(self.wid, rect, "", 1, vx, 0, 32767, 16, 0)
if not self.barx_enabled: self.barx.HiliteControl(255) if not self.barx_enabled: self.barx.HiliteControl(255)
## InvalRect(rect) ## InvalWindowRect(rect)
if wanty: if wanty:
rect = x1-(SCROLLBARWIDTH-1), y0-1, x1+1, y1-(SCROLLBARWIDTH-2) rect = x1-(SCROLLBARWIDTH-1), y0-1, x1+1, y1-(SCROLLBARWIDTH-2)
self.bary = NewControl(self.wid, rect, "", 1, vy, 0, 32767, 16, 0) self.bary = NewControl(self.wid, rect, "", 1, vy, 0, 32767, 16, 0)
if not self.bary_enabled: self.bary.HiliteControl(255) if not self.bary_enabled: self.bary.HiliteControl(255)
## InvalRect(rect) ## InvalWindowRect(rect)
def do_postclose(self): def do_postclose(self):
self.barx = self.bary = None self.barx = self.bary = None
@ -893,11 +893,11 @@ def do_postresize(self, width, height, window):
self.bary.SizeControl(SCROLLBARWIDTH, (b-t)-(SCROLLBARWIDTH-3)) # jvr self.bary.SizeControl(SCROLLBARWIDTH, (b-t)-(SCROLLBARWIDTH-3)) # jvr
if self.barx: if self.barx:
self.barx.ShowControl() # jvr self.barx.ShowControl() # jvr
ValidRect((l, b - SCROLLBARWIDTH + 1, r - SCROLLBARWIDTH + 2, b)) # jvr ValidWindowRect((l, b - SCROLLBARWIDTH + 1, r - SCROLLBARWIDTH + 2, b)) # jvr
if self.bary: if self.bary:
self.bary.ShowControl() # jvr self.bary.ShowControl() # jvr
ValidRect((r - SCROLLBARWIDTH + 1, t, r, b - SCROLLBARWIDTH + 2)) # jvr ValidWindowRect((r - SCROLLBARWIDTH + 1, t, r, b - SCROLLBARWIDTH + 2)) # jvr
InvalRect((r - SCROLLBARWIDTH + 1, b - SCROLLBARWIDTH + 1, r, b)) # jvr, growicon InvalWindowRect((r - SCROLLBARWIDTH + 1, b - SCROLLBARWIDTH + 1, r, b)) # jvr, growicon
def do_rawcontrolhit(self, window, control, pcode, local, event): def do_rawcontrolhit(self, window, control, pcode, local, event):

2
Mac/Lib/test/tscrollwin.py
View File

@ -47,7 +47,7 @@ def scrollbar_callback(self, which, what, value):
self.vy = value self.vy = value
else: else:
self.vy = self.vy + delta self.vy = self.vy + delta
Win.InvalRect(self.ourrect) Win.InvalWindowRect(self.ourrect)
def do_update(self, wid, event): def do_update(self, wid, event):
Qd.EraseRect(self.ourrect) Qd.EraseRect(self.ourrect)

2
Mac/Tools/IDE/PyEdit.py
View File

@ -957,7 +957,7 @@ def replaceall(self):
editor.ted.WEUseText(Res.Resource(Text)) editor.ted.WEUseText(Res.Resource(Text))
editor.ted.WECalText() editor.ted.WECalText()
editor.SetPort() editor.SetPort()
Win.InvalRect(editor._bounds) Win.InvalWindowRect(editor._bounds)
#editor.ted.WEUpdate(self.w.wid.GetWindowPort().visRgn) #editor.ted.WEUpdate(self.w.wid.GetWindowPort().visRgn)
EasyDialogs.Message("Replaced %d occurrences" % counter) EasyDialogs.Message("Replaced %d occurrences" % counter)

2
Mac/Tools/IDE/Splash.py
View File

@ -100,7 +100,7 @@ def UpdateSplash(drawdialog = 0, what = 0):
if drawdialog: if drawdialog:
splash.DrawDialog() splash.DrawDialog()
drawtext(what) drawtext(what)
Win.ValidRect(splash.GetWindowPort().portRect) Win.ValidWindowRect(splash.GetWindowPort().portRect)
def drawtext(what = 0): def drawtext(what = 0):
Qd.SetPort(splash) Qd.SetPort(splash)

16
Mac/Tools/IDE/Wbase.py
View File

@ -104,8 +104,8 @@ def bind(self, key, callback):
def adjust(self, oldbounds): def adjust(self, oldbounds):
self.SetPort() self.SetPort()
Win.InvalRect(oldbounds) Win.InvalWindowRect(oldbounds)
Win.InvalRect(self._bounds) Win.InvalWindowRect(self._bounds)
def _calcbounds(self): def _calcbounds(self):
# calculate absolute bounds relative to the window origin from our # calculate absolute bounds relative to the window origin from our
@ -218,7 +218,7 @@ def _addwidget(self, key, widget):
self._setparentwindow(widget) self._setparentwindow(widget)
if self._parentwindow and self._parentwindow.wid: if self._parentwindow and self._parentwindow.wid:
widget.forall_frombottom("open") widget.forall_frombottom("open")
Win.InvalRect(widget._bounds) Win.InvalWindowRect(widget._bounds)
def _setparentwindow(self, widget): def _setparentwindow(self, widget):
widget._parentwindow = self._parentwindow widget._parentwindow = self._parentwindow
@ -235,7 +235,7 @@ def _removewidget(self, key):
widget.select(0) widget.select(0)
self._parentwindow._currentwidget = None self._parentwindow._currentwidget = None
self.SetPort() self.SetPort()
Win.InvalRect(widget._bounds) Win.InvalWindowRect(widget._bounds)
widget.close() widget.close()
del self._widgetsdict[key] del self._widgetsdict[key]
self._widgets.remove(widget) self._widgets.remove(widget)
@ -340,11 +340,11 @@ def drawselframe(self, onoff):
def adjust(self, oldbounds): def adjust(self, oldbounds):
self.SetPort() self.SetPort()
if self._selected: if self._selected:
Win.InvalRect(Qd.InsetRect(oldbounds, -3, -3)) Win.InvalWindowRect(Qd.InsetRect(oldbounds, -3, -3))
Win.InvalRect(Qd.InsetRect(self._bounds, -3, -3)) Win.InvalWindowRect(Qd.InsetRect(self._bounds, -3, -3))
else: else:
Win.InvalRect(oldbounds) Win.InvalWindowRect(oldbounds)
Win.InvalRect(self._bounds) Win.InvalWindowRect(self._bounds)
class _Line(Widget): class _Line(Widget):

14
Mac/Tools/IDE/Wcontrols.py
View File

@ -32,7 +32,7 @@ def open(self):
self._procID, self._procID,
0) 0)
self.SetPort() self.SetPort()
#Win.ValidRect(self._bounds) #Win.ValidWindowRect(self._bounds)
self.enable(self._enabled) self.enable(self._enabled)
def adjust(self, oldbounds): def adjust(self, oldbounds):
@ -43,7 +43,7 @@ def adjust(self, oldbounds):
if self._visible: if self._visible:
Qd.EraseRect(self._bounds) Qd.EraseRect(self._bounds)
self._control.ShowControl() self._control.ShowControl()
Win.ValidRect(self._bounds) Win.ValidWindowRect(self._bounds)
def close(self): def close(self):
self._control.HideControl() self._control.HideControl()
@ -162,8 +162,8 @@ def adjust(self, oldbounds):
old = Qd.InsetRect(oldbounds, -4, -4) old = Qd.InsetRect(oldbounds, -4, -4)
new = Qd.InsetRect(self._bounds, -4, -4) new = Qd.InsetRect(self._bounds, -4, -4)
Qd.EraseRect(old) Qd.EraseRect(old)
Win.InvalRect(old) Win.InvalWindowRect(old)
Win.InvalRect(new) Win.InvalWindowRect(new)
ControlWidget.adjust(self, oldbounds) ControlWidget.adjust(self, oldbounds)
@ -346,7 +346,7 @@ def draw(self, visRgn = None):
def adjust(self, oldbounds): def adjust(self, oldbounds):
self.SetPort() self.SetPort()
Win.InvalRect(oldbounds) Win.InvalWindowRect(oldbounds)
self._control.HideControl() self._control.HideControl()
self._control.MoveControl(self._bounds[0], self._bounds[1]) self._control.MoveControl(self._bounds[0], self._bounds[1])
self._control.SizeControl(self._bounds[2] - self._bounds[0], self._bounds[3] - self._bounds[1]) self._control.SizeControl(self._bounds[2] - self._bounds[0], self._bounds[3] - self._bounds[1])
@ -356,7 +356,7 @@ def adjust(self, oldbounds):
self._control.ShowControl() self._control.ShowControl()
else: else:
Qd.FrameRect(self._bounds) Qd.FrameRect(self._bounds)
Win.ValidRect(self._bounds) Win.ValidWindowRect(self._bounds)
def activate(self, onoff): def activate(self, onoff):
self._activated = onoff self._activated = onoff
@ -366,7 +366,7 @@ def activate(self, onoff):
else: else:
self._control.HideControl() self._control.HideControl()
self.draw(None) self.draw(None)
Win.ValidRect(self._bounds) Win.ValidWindowRect(self._bounds)
def set(self, value): def set(self, value):
if self._control: if self._control:

10
Mac/Tools/IDE/Wlists.py
View File

@ -57,11 +57,11 @@ def createlist(self):
def adjust(self, oldbounds): def adjust(self, oldbounds):
self.SetPort() self.SetPort()
if self._selected: if self._selected:
Win.InvalRect(Qd.InsetRect(oldbounds, -3, -3)) Win.InvalWindowRect(Qd.InsetRect(oldbounds, -3, -3))
Win.InvalRect(Qd.InsetRect(self._bounds, -3, -3)) Win.InvalWindowRect(Qd.InsetRect(self._bounds, -3, -3))
else: else:
Win.InvalRect(oldbounds) Win.InvalWindowRect(oldbounds)
Win.InvalRect(self._bounds) Win.InvalWindowRect(self._bounds)
if oldbounds[:2] == self._bounds[:2]: if oldbounds[:2] == self._bounds[:2]:
# set visRgn to empty, to prevent nasty drawing side effect of LSize() # set visRgn to empty, to prevent nasty drawing side effect of LSize()
Qd.RectRgn(self._parentwindow.wid.GetWindowPort().visRgn, (0, 0, 0, 0)) Qd.RectRgn(self._parentwindow.wid.GetWindowPort().visRgn, (0, 0, 0, 0))
@ -359,7 +359,7 @@ def setdrawingmode(self, onoff):
self.SetPort() self.SetPort()
Qd.EraseRect((l, cb, cr, b)) Qd.EraseRect((l, cb, cr, b))
self._list.LUpdate(self._parentwindow.wid.GetWindowPort().visRgn) self._list.LUpdate(self._parentwindow.wid.GetWindowPort().visRgn)
Win.ValidRect(bounds) Win.ValidWindowRect(bounds)
else: else:
if self.drawingmode == 0 and self._list is not None: if self.drawingmode == 0 and self._list is not None:
self._list.LSetDrawingMode(0) self._list.LSetDrawingMode(0)

8
Mac/Tools/IDE/Wquicktime.py
View File

@ -24,14 +24,14 @@ def __init__(self, possize):
def adjust(self, oldbounds): def adjust(self, oldbounds):
self.SetPort() self.SetPort()
Win.InvalRect(oldbounds) Win.InvalWindowRect(oldbounds)
Win.InvalRect(self._bounds) Win.InvalWindowRect(self._bounds)
self.calcmoviebox() self.calcmoviebox()
def set(self, path_or_fss, start = 0): def set(self, path_or_fss, start = 0):
self.SetPort() self.SetPort()
if self.movie: if self.movie:
#Win.InvalRect(self.movie.GetMovieBox()) #Win.InvalWindowRect(self.movie.GetMovieBox())
Qd.PaintRect(self.movie.GetMovieBox()) Qd.PaintRect(self.movie.GetMovieBox())
if type(path_or_fss) == type(''): if type(path_or_fss) == type(''):
path = path_or_fss path = path_or_fss
@ -106,7 +106,7 @@ def idle(self, *args):
elif self.running: elif self.running:
box = self.movie.GetMovieBox() box = self.movie.GetMovieBox()
self.SetPort() self.SetPort()
Win.InvalRect(box) Win.InvalWindowRect(box)
self.movie = None self.movie = None
self.running = 0 self.running = 0

10
Mac/Tools/IDE/Wtext.py
View File

@ -213,11 +213,11 @@ def setfontsettings(self, (font, style, size, color)):
def adjust(self, oldbounds): def adjust(self, oldbounds):
self.SetPort() self.SetPort()
if self._selected and self._parentwindow._hasselframes: if self._selected and self._parentwindow._hasselframes:
Win.InvalRect(Qd.InsetRect(oldbounds, -3, -3)) Win.InvalWindowRect(Qd.InsetRect(oldbounds, -3, -3))
Win.InvalRect(Qd.InsetRect(self._bounds, -3, -3)) Win.InvalWindowRect(Qd.InsetRect(self._bounds, -3, -3))
else: else:
Win.InvalRect(oldbounds) Win.InvalWindowRect(oldbounds)
Win.InvalRect(self._bounds) Win.InvalWindowRect(self._bounds)
viewrect, destrect = self._calctextbounds() viewrect, destrect = self._calctextbounds()
self.ted.WESetViewRect(viewrect) self.ted.WESetViewRect(viewrect)
self.ted.WESetDestRect(destrect) self.ted.WESetDestRect(destrect)
@ -305,7 +305,7 @@ def set(self, text):
Qd.RectRgn(rgn, viewrect) Qd.RectRgn(rgn, viewrect)
Qd.EraseRect(viewrect) Qd.EraseRect(viewrect)
self.draw(rgn) self.draw(rgn)
#Win.InvalRect(self.ted.WEGetViewRect()) #Win.InvalWindowRect(self.ted.WEGetViewRect())
self.updatescrollbars() self.updatescrollbars()
def get(self): def get(self):

6
Mac/Tools/IDE/Wwindows.py
View File

@ -157,7 +157,7 @@ def resize(self, x, y = None):
if y == None: if y == None:
x, y = x x, y = x
self.SetPort() self.SetPort()
Win.InvalRect(self.getgrowrect()) Win.InvalWindowRect(self.getgrowrect())
self.wid.SizeWindow(x, y, 1) self.wid.SizeWindow(x, y, 1)
self._calcbounds() self._calcbounds()
@ -247,7 +247,7 @@ def previouswidget(self):
def drawwidgetbounds(self, onoff): def drawwidgetbounds(self, onoff):
self._drawwidgetbounds = onoff self._drawwidgetbounds = onoff
self.SetPort() self.SetPort()
Win.InvalRect(self._bounds) Win.InvalWindowRect(self._bounds)
def _drawbounds(self): def _drawbounds(self):
pass pass
@ -353,7 +353,7 @@ def do_activate(self, onoff, event):
self.draw() self.draw()
def do_postresize(self, width, height, window): def do_postresize(self, width, height, window):
Win.InvalRect(self.getgrowrect()) Win.InvalWindowRect(self.getgrowrect())
self._calcbounds() self._calcbounds()
def do_inGoAway(self, partcode, window, event): def do_inGoAway(self, partcode, window, event):

2
Mac/scripts/MkDistr_ui.py
View File

@ -115,7 +115,7 @@ def setlist(self, contents):
self.list.LSetCell(contents[i], (0, i)) self.list.LSetCell(contents[i], (0, i))
self.list.LSetDrawingMode(1) self.list.LSetDrawingMode(1)
##self.list.LUpdate(self.wid.GetWindowPort().visRgn) ##self.list.LUpdate(self.wid.GetWindowPort().visRgn)
Win.InvalRect(self.listrect) Win.InvalWindowRect(self.listrect)
def additem(self, item): def additem(self, item):
where = self.list.LAddRow(1, 0) where = self.list.LAddRow(1, 0)