Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Lots of minor tweaks for the pep252 checkins, mainly because Qd 

attributes are no longer supported.
This commit is contained in:
Jack Jansen 2002-11-30 00:01:29 +00:00
parent 202355a333
commit 362c7cd07b
25 changed files with 60 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Mac/Contrib/ImageHelpers/MovieUtils.py
View File

@ -124,7 +124,7 @@ class ExtMovie:
#Qd.MoveTo(10,10)
#Qd.LineTo(200,150)
Qd.CopyBits(self.gw.portBits,Qd.GetPort().portBits,self.myRect,destRect,srcCopy,None)
Qd.CopyBits(self.gw.GetPortBitMapForCopyBits(),Qd.GetPort().GetPortBitMapForCopyBits(),self.myRect,destRect,srcCopy,None)
class MovieWin(W.Window):

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

@ -93,7 +93,7 @@ class ICONwindow(FrameWork.Window):
def fitrect(self):
"""Return self.pictrect scaled to fit in window"""
graf = self.wid.GetWindowPort()
screenrect = graf.portRect
screenrect = graf.GetPortBounds()
picwidth = self.pictrect[2] - self.pictrect[0]
picheight = self.pictrect[3] - self.pictrect[1]
if picwidth > screenrect[2] - screenrect[0]:

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

@ -93,7 +93,7 @@ class PICTwindow(FrameWork.Window):
def fitrect(self):
"""Return self.pictrect scaled to fit in window"""
graf = self.dlg.GetWindowPort()
screenrect = graf.portRect
screenrect = graf.GetPortBounds()
picwidth = self.pictrect[2] - self.pictrect[0]
picheight = self.pictrect[3] - self.pictrect[1]
if picwidth > screenrect[2] - screenrect[0]:

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

@ -93,7 +93,7 @@ class CIconwindow(FrameWork.Window):
def fitrect(self):
"""Return self.pictrect scaled to fit in window"""
graf = self.wid.GetWindowPort()
screenrect = graf.portRect
screenrect = graf.GetPortBounds()
picwidth = self.pictrect[2] - self.pictrect[0]
picheight = self.pictrect[3] - self.pictrect[1]
if picwidth > screenrect[2] - screenrect[0]:

10
Mac/Demo/imgbrowse/imgbrowse.py
View File

@ -1,4 +1,4 @@
"""imgbrowse - Display pictures using img"""
GetPortBounds()"""imgbrowse - Display pictures using img"""
import FrameWork
import EasyDialogs
@ -88,16 +88,16 @@ class imgwindow(FrameWork.Window):
currect = self.fitrect()
print 'PICT:', self.pictrect
print 'WIND:', currect
print 'ARGS:', (self.pixmap, self.wid.GetWindowPort().portBits, self.pictrect,
print 'ARGS:', (self.pixmap, self.wid.GetWindowPort().GetPortBitMapForCopyBits(), self.pictrect,
currect, QuickDraw.srcCopy, None)
self.info()
Qd.CopyBits(self.pixmap, self.wid.GetWindowPort().portBits, self.pictrect,
Qd.CopyBits(self.pixmap, self.wid.GetWindowPort().GetPortBitMapForCopyBits(), self.pictrect,
currect, QuickDraw.srcCopy, None)
def fitrect(self):
"""Return self.pictrect scaled to fit in window"""
graf = self.wid.GetWindowPort()
screenrect = graf.portRect
screenrect = graf.GetPortBounds()
picwidth = self.pictrect[2] - self.pictrect[0]
picheight = self.pictrect[3] - self.pictrect[1]
if picwidth > screenrect[2] - screenrect[0]:
@ -113,7 +113,7 @@ class imgwindow(FrameWork.Window):
def info(self):
graf = self.wid.GetWindowPort()
bits = graf.portBits
bits = graf.GetPortBitMapForCopyBits()
mac_image.dumppixmap(bits.pixmap_data)
main()

2
Mac/Demo/mlte/mlted.py
View File

@ -362,7 +362,7 @@ class Mlted(Application):
if self.active:
self.active.do_idle(event)
else:
Qd.SetCursor(Qd.qd.arrow)
Qd.SetCursor(Qd.GetQDGlobalsArrow())
def main():
Mlte.TXNInitTextension(0)

2
Mac/Demo/quicktime/MovieInWindow.py
View File

@ -31,7 +31,7 @@ def main():
Qd.SetPort(theWindow)
# XXXX Needed? SetGWorld((CGrafPtr)theWindow, nil)
playMovieInWindow(theWindow, fss, theWindow.GetWindowPort().portRect)
playMovieInWindow(theWindow, fss, theWindow.GetWindowPort().GetPortBounds())
def playMovieInWindow(theWindow, theFile, movieBox):
"""Play a movie in a window"""

2
Mac/Demo/quicktime/VerySimplePlayer.py
View File

@ -78,7 +78,7 @@ def main():
else:
Qd.SetPort(whichWindow)
whichWindow.BeginUpdate()
Qd.EraseRect(whichWindow.GetWindowPort().portRect)
Qd.EraseRect(whichWindow.GetWindowPort().GetPortBounds())
whichWindow.EndUpdate()
def loadMovie(theFile):

8
Mac/Demo/textedit/ped.py
View File

@ -21,7 +21,7 @@ class TEWindow(ScrolledWindow):
r = windowbounds(400, 400)
w = Win.NewWindow(r, name, 1, 0, -1, 1, 0)
self.wid = w
x0, y0, x1, y1 = self.wid.GetWindowPort().portRect
x0, y0, x1, y1 = self.wid.GetWindowPort().GetPortBounds()
x0 = x0 + 4
y0 = y0 + 4
x1 = x1 - 20
@ -87,8 +87,8 @@ class TEWindow(ScrolledWindow):
self.ted.TEDeactivate()
def do_update(self, wid, event):
Qd.EraseRect(wid.GetWindowPort().portRect)
self.ted.TEUpdate(wid.GetWindowPort().portRect)
Qd.EraseRect(wid.GetWindowPort().GetPortBounds())
self.ted.TEUpdate(wid.GetWindowPort().GetPortBounds())
self.updatescrollbars()
def do_contentclick(self, local, modifiers, evt):
@ -350,7 +350,7 @@ class Ped(Application):
if self.active:
self.active.do_idle()
else:
Qd.SetCursor(Qd.qd.arrow)
Qd.SetCursor(Qd.GetQDGlobalsArrow())
def main():
App = Ped()

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

@ -95,7 +95,7 @@ class WasteWindow(ScrolledWindow):
self.ted.WEIdle()
if self.ted.WEAdjustCursor(where, BIGREGION):
return
Qd.SetCursor(Qd.qd.arrow)
Qd.SetCursor(Qd.GetQDGlobalsArrow())
def getscrollbarvalues(self):
dr = self.ted.WEGetDestRect()
@ -780,7 +780,7 @@ class Wed(Application):
if self.active:
self.active.do_idle(event)
else:
Qd.SetCursor(Qd.qd.arrow)
Qd.SetCursor(Qd.GetQDGlobalsArrow())
def newRuler(self, obj):
"""Insert a new ruler. Make it as wide as the window minus 2 pxls"""

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

@ -83,7 +83,7 @@ class WasteWindow(ScrolledWindow):
self.ted.WEIdle()
if self.ted.WEAdjustCursor(where, BIGREGION):
return
Qd.SetCursor(Qd.qd.arrow)
Qd.SetCursor(Qd.GetQDGlobalsArrow())
def getscrollbarvalues(self):
dr = self.ted.WEGetDestRect()
@ -609,7 +609,7 @@ class Wed(Application):
if self.active:
self.active.do_idle(event)
else:
Qd.SetCursor(Qd.qd.arrow)
Qd.SetCursor(Qd.GetQDGlobalsArrow())
def getfontnames():
names = []

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

@ -50,7 +50,7 @@ class WasteWindow(ScrolledWindow):
self.ted.WEIdle()
if self.ted.WEAdjustCursor(where, BIGREGION):
return
Qd.SetCursor(Qd.qd.arrow)
Qd.SetCursor(Qd.GetQDGlobalsArrow())
def getscrollbarvalues(self):
dr = self.ted.WEGetDestRect()
@ -417,7 +417,7 @@ class Wed(Application):
if self.active:
self.active.do_idle(event)
else:
Qd.SetCursor(Qd.qd.arrow)
Qd.SetCursor(Qd.GetQDGlobalsArrow())
def main():
App = Wed()

2
Mac/Lib/EasyDialogs.py
View File

@ -222,7 +222,7 @@ def AskYesNoCancel(question, default = 0, yes=None, no=None, cancel=None, id=262
screenbounds = Qd.qd.screenBits.bounds
screenbounds = Qd.GetQDGlobalsScreenBits().bounds
screenbounds = screenbounds[0]+4, screenbounds[1]+4, \
screenbounds[2]-4, screenbounds[3]-4

14
Mac/Lib/FrameWork.py
View File

@ -68,7 +68,7 @@ partname[8] = 'inZoomOut'
#
# The useable portion of the screen
# ## but what happens with multiple screens? jvr
screenbounds = qd.screenBits.bounds
screenbounds = GetQDGlobalsScreenBits().bounds
screenbounds = screenbounds[0]+4, screenbounds[1]+4, \
screenbounds[2]-4, screenbounds[3]-4
@ -97,7 +97,7 @@ def setwatchcursor():
SetCursor(_watch)
def setarrowcursor():
SetCursor(qd.arrow)
SetCursor(GetQDGlobalsArrow())
class Application:
@ -808,7 +808,7 @@ class Window:
growlimit = (50, 50, screenbounds[2] - screenbounds[0], screenbounds[3] - screenbounds[1]) # jvr
def do_resize(self, width, height, window):
l, t, r, b = self.wid.GetWindowPort().portRect # jvr, forGrowIcon
l, t, r, b = self.wid.GetWindowPort().GetPortBounds() # jvr, forGrowIcon
self.SetPort() # jvr
self.wid.InvalWindowRect((r - SCROLLBARWIDTH + 1, b - SCROLLBARWIDTH + 1, r, b)) # jvr
window.SizeWindow(width, height, 1) # changed updateFlag to true jvr
@ -816,7 +816,7 @@ class Window:
def do_postresize(self, width, height, window):
SetPort(window)
self.wid.InvalWindowRect(window.GetWindowPort().portRect)
self.wid.InvalWindowRect(window.GetWindowPort().GetPortBounds())
def do_inContent(self, partcode, window, event):
#
@ -849,7 +849,7 @@ class Window:
for i in range(8):
time.sleep(0.1)
InvertRgn(window.GetWindowPort().visRgn)
FillRgn(window.GetWindowPort().visRgn, qd.gray)
FillRgn(window.GetWindowPort().visRgn, GetQDGlobalsGray())
else:
EraseRgn(window.GetWindowPort().visRgn)
@ -902,7 +902,7 @@ class ScrolledWindow(ControlsWindow):
SetPort(self.wid)
self.barx = self.bary = None
self.barx_enabled = self.bary_enabled = 1
x0, y0, x1, y1 = self.wid.GetWindowPort().portRect
x0, y0, x1, y1 = self.wid.GetWindowPort().GetPortBounds()
vx, vy = self.getscrollbarvalues()
if vx == None: self.barx_enabled, vx = 0, 0
if vy == None: self.bary_enabled, vy = 0, 0
@ -938,7 +938,7 @@ class ScrolledWindow(ControlsWindow):
self.wid.DrawGrowIcon() # jvr
def do_postresize(self, width, height, window):
l, t, r, b = self.wid.GetWindowPort().portRect
l, t, r, b = self.wid.GetWindowPort().GetPortBounds()
self.SetPort()
if self.barx:
self.barx.HideControl() # jvr

2
Mac/Lib/PixMapWrapper.py
View File

@ -151,7 +151,7 @@ class PixMapWrapper:
if y2 == None:
dest[3] = y1 + src[3]-src[1]
if not port: port = Qd.GetPort()
Qd.CopyBits(self.PixMap(), port.portBits, src, tuple(dest),
Qd.CopyBits(self.PixMap(), port.GetPortBitMapForCopyBits(), src, tuple(dest),
QuickDraw.srcCopy, None)
def fromstring(self,s,width,height,format=imgformat.macrgb):

2
Mac/Lib/bgenlocations.py
View File

@ -28,7 +28,7 @@ else:
if sys.platform == 'mac':
_MWERKSDIR="Macintosh HD:Applications (Mac OS 9):Metrowerks CodeWarrior 7.0:Metrowerks CodeWarrior"
else:
_MWERKSDIR="/Volumes/Sap/Applications (Mac OS 9)/Metrowerks CodeWarrior 7.0/Metrowerks CodeWarrior/"
_MWERKSDIR="/Volumes/Moes/Applications (Mac OS 9)/Metrowerks CodeWarrior 7.0/Metrowerks CodeWarrior/"
INCLUDEDIR=os.path.join(_MWERKSDIR, "MacOS Support", "Universal", "Interfaces", "CIncludes")
#

4
Mac/Tools/IDE/MacPrefs.py
View File

@ -70,7 +70,7 @@ class PrefFile(PrefObject):
else:
prefdict[key] = value
marshal.dump(prefdict, open(self.__path, 'wb'))
fss = macfs.FSSpec(self.__path)
fss = macfs.FSSpec(macfs.FSRef(self.__path))
fss.SetCreatorType(self.__creator, 'pref')
def __getattr__(self, attr):
@ -97,7 +97,7 @@ def GetPrefs(prefname, creator = 'Pyth'):
# Find the preferences folder and our prefs file, create if needed.
vrefnum, dirid = macfs.FindFolder(kOnSystemDisk, 'pref', 0)
prefsfolder_fss = macfs.FSSpec((vrefnum, dirid, ''))
prefsfolder = prefsfolder_fss.as_pathname()
prefsfolder = macfs.FSRef(prefsfolder_fss).as_fsspec().as_pathname()
path = os.path.join(prefsfolder, prefname)
head, tail = os.path.split(path)
# make sure the folder(s) exist

5
Mac/Tools/IDE/PyBrowser.py
View File

@ -5,7 +5,6 @@ import string
import types
import re
from Carbon import Qd, Icn, Fm, QuickDraw
from Carbon.List import GetListPort
from Carbon.QuickDraw import hilitetransfermode
@ -211,7 +210,7 @@ class BrowserWidget(W.CustomList):
Qd.PaintRect(rect)
lastpoint = (x, y)
Qd.PaintRect(rect)
Qd.PenPat(Qd.qd.black)
Qd.PenPat(Qd.GetQDGlobalsBlack())
Qd.PenNormal()
if newcol > 0 and newcol <> abscol:
self.setcolumn(newcol - l)
@ -369,7 +368,7 @@ class BrowserWidget(W.CustomList):
def myDrawCell(self, onlyHilite, selected, cellRect, theCell,
dataOffset, dataLen, theList):
savedPort = Qd.GetPort()
Qd.SetPort(GetListPort(theList))
Qd.SetPort(theList.GetListPort())
savedClip = Qd.NewRgn()
Qd.GetClip(savedClip)
Qd.ClipRect(cellRect)

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

@ -108,8 +108,8 @@ class ConsoleTextWidget(W.EditText):
self._buf = ""
self.ted.WEClearUndo()
self.updatescrollbars()
if Qd.QDIsPortBuffered(self._parentwindow.wid):
Qd.QDFlushPortBuffer(self._parentwindow.wid, None)
if self._parentwindow.wid.GetWindowPort().QDIsPortBuffered():
self._parentwindow.wid.GetWindowPort().QDFlushPortBuffer(None)
def selection_ok(self):
selstart, selend = self.getselection()
@ -300,8 +300,8 @@ class PyOutput:
self._buf = ""
self.w.outputtext.updatescrollbars()
self.w.outputtext.ted.WEFeatureFlag(WASTEconst.weFReadOnly, 1)
if Qd.QDIsPortBuffered(self.w.wid):
Qd.QDFlushPortBuffer(self.w.wid, None)
if self.w.wid.GetWindowPort().QDIsPortBuffered():
self.w.wid.GetWindowPort().QDFlushPortBuffer(None)
def show(self):
if self.closed:

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

@ -48,8 +48,8 @@ def UpdateSplash(drawdialog = 0, what = 0):
if drawdialog:
splash.DrawDialog()
drawtext(what)
splash.GetDialogWindow().ValidWindowRect(splash.GetDialogPort().portRect)
Qd.QDFlushPortBuffer(splash.GetDialogWindow().GetWindowPort(), None)
splash.GetDialogWindow().ValidWindowRect(splash.GetDialogPort().GetPortBounds())
splash.GetDialogWindow().GetWindowPort().QDFlushPortBuffer(None)
def drawtext(what = 0):
Qd.SetPort(splash)

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

@ -376,7 +376,7 @@ class VerticalLine(_Line):
class Frame(Widget):
def __init__(self, possize, pattern = Qd.qd.black, color = (0, 0, 0)):
def __init__(self, possize, pattern = Qd.GetQDGlobalsBlack(), color = (0, 0, 0)):
Widget.__init__(self, possize)
self._framepattern = pattern
self._framecolor = color
@ -570,7 +570,7 @@ class HorizontalPanes(Widget):
# track mouse --- XXX move to separate method?
Qd.PenMode(QuickDraw.srcXor)
Qd.PenPat(Qd.qd.gray)
Qd.PenPat(Qd.GetQDGlobalsGray())
Qd.PaintRect(rect)
lastpos = None
while Evt.Button():
@ -579,16 +579,16 @@ class HorizontalPanes(Widget):
pos = min(pos, maxpos)
if pos == lastpos:
continue
Qd.PenPat(Qd.qd.gray)
Qd.PenPat(Qd.GetQDGlobalsGray())
Qd.PaintRect(rect)
if self._direction:
rect = l, pos - 1, r, pos
else:
rect = pos - 1, t, pos, b
Qd.PenPat(Qd.qd.gray)
Qd.PenPat(Qd.GetQDGlobalsGray())
Qd.PaintRect(rect)
lastpos = pos
Qd.QDFlushPortBuffer(self._parentwindow.wid, None)
self._parentwindow.wid.GetWindowPort().QDFlushPortBuffer(None)
Evt.WaitNextEvent(0, 3)
Qd.PaintRect(rect)
Qd.PenNormal()
@ -643,7 +643,7 @@ class ColorPicker(ClickableWidget):
if self._visible:
if not visRgn:
visRgn = self._parentwindow.wid.GetWindowPort().visRgn
Qd.PenPat(Qd.qd.gray)
Qd.PenPat(Qd.GetQDGlobalsGray())
rect = self._bounds
Qd.FrameRect(rect)
rect = Qd.InsetRect(rect, 3, 3)
@ -700,7 +700,7 @@ def HasBaseClass(obj, class_):
# data below.
#_cursors = {
# "watch" : Qd.GetCursor(QuickDraw.watchCursor).data,
# "arrow" : Qd.qd.arrow,
# "arrow" : Qd.GetQDGlobalsArrow(),
# "iBeam" : Qd.GetCursor(QuickDraw.iBeamCursor).data,
# "cross" : Qd.GetCursor(QuickDraw.crossCursor).data,
# "plus" : Qd.GetCursor(QuickDraw.plusCursor).data,

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

@ -170,7 +170,7 @@ class Button(ControlWidget):
# emulate the pushing of the button
import time
self._control.HiliteControl(Controls.kControlButtonPart)
Qd.QDFlushPortBuffer(self._parentwindow.wid, None) # needed under OSX
self._parentwindow.wid.GetWindowPort().QDFlushPortBuffer(None) # needed under OSX
time.sleep(0.1)
self._control.HiliteControl(0)
if self._callback:

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

@ -2,7 +2,7 @@ import Wbase
import Wkeys
import string
from Carbon import Evt, Events, Fm, Lists, Qd, Scrap, Win
from Carbon.List import LNew, CreateCustomList, GetListPort
from Carbon.List import LNew, CreateCustomList
from Carbon.Lists import kListDefUserProcType, lInitMsg, lDrawMsg, lHiliteMsg, lCloseMsg
from Carbon.QuickDraw import hilitetransfermode
from Carbon import App
@ -435,7 +435,7 @@ class TwoLineList(CustomList):
def listDefDraw(self, selected, cellRect, theCell,
dataOffset, dataLen, theList):
savedPort = Qd.GetPort()
Qd.SetPort(GetListPort(theList))
Qd.SetPort(theList.GetListPort())
savedClip = Qd.NewRgn()
Qd.GetClip(savedClip)
Qd.ClipRect(cellRect)
@ -477,7 +477,7 @@ class TwoLineList(CustomList):
def listDefHighlight(self, selected, cellRect, theCell,
dataOffset, dataLen, theList):
savedPort = Qd.GetPort()
Qd.SetPort(GetListPort(theList))
Qd.SetPort(theList.GetListPort())
savedClip = Qd.NewRgn()
Qd.GetClip(savedClip)
Qd.ClipRect(cellRect)

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

@ -965,7 +965,7 @@ class PyEditor(TextEditor):
if autoscroll:
self.ted.WEFeatureFlag(WASTEconst.weFAutoScroll, 0)
self.ted.WESetSelection(count, count + 1)
Qd.QDFlushPortBuffer(self._parentwindow.wid, None) # needed under OSX
self._parentwindow.wid.GetWindowPort().QDFlushPortBuffer(None) # needed under OSX
time.sleep(0.2)
self.ted.WESetSelection(selstart, selend)
if autoscroll:
@ -1042,7 +1042,7 @@ class PyEditor(TextEditor):
breakrect = bl, bt, br, bb = self._getbreakrect()
br = br - 1
self.SetPort()
Qd.PenPat(Qd.qd.gray)
Qd.PenPat(Qd.GetQDGlobalsGray())
Qd.PaintRect((br, bt, br + 1, bb))
Qd.PenNormal()
self._parentwindow.tempcliprect(breakrect)
@ -1123,7 +1123,7 @@ def GetFNum(fontname):
GetFName = Fm.GetFontName
def GetPortFontSettings(port):
return Fm.GetFontName(port.txFont), port.txFace, port.txSize
return Fm.GetFontName(port.GetPortTextFont()), port.GetPortTextFace(), port.GetPortTextSize()
def SetPortFontSettings(port, (font, face, size)):
saveport = Qd.GetPort()

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

@ -270,7 +270,7 @@ class Window(FrameWork.Window, Wbase.SelectableWidget):
self._collectselectablewidgets(w._widgets)
def _calcbounds(self):
self._possize = self.wid.GetWindowPort().portRect[2:]
self._possize = self.wid.GetWindowPort().GetPortBounds()[2:]
w, h = self._possize
self._bounds = (0, 0, w, h)
self.wid.GetWindowContentRgn(scratchRegion)
@ -387,7 +387,7 @@ class Window(FrameWork.Window, Wbase.SelectableWidget):
del self.saveclip[-1]
def getgrowrect(self):
l, t, r, b = self.wid.GetWindowPort().portRect
l, t, r, b = self.wid.GetWindowPort().GetPortBounds()
return (r - 15, b - 15, r, b)
def has_key(self, key):
@ -423,7 +423,7 @@ class Dialog(Window):
return 0
def getwindowbounds(self, size, minsize = None):
screenbounds = sl, st, sr, sb = Qd.qd.screenBits.bounds
screenbounds = sl, st, sr, sb = Qd.GetQDGlobalsScreenBits().bounds
w, h = size
l = sl + (sr - sl - w) / 2
t = st + (sb - st - h) / 3
@ -615,7 +615,7 @@ def windowbounds(preferredsize, minsize=None):
minwidth, minheight = minsize
width, height = preferredsize
sl, st, sr, sb = screenbounds = Qd.InsetRect(Qd.qd.screenBits.bounds, 4, 4)
sl, st, sr, sb = screenbounds = Qd.InsetRect(Qd.GetQDGlobalsScreenBits().bounds, 4, 4)
l, t = getnextwindowpos()
if (l + width) > sr:
_windowcounter = 0