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

attributes are no longer supported.

diff --git a/Mac/Contrib/ImageHelpers/MovieUtils.py b/Mac/Contrib/ImageHelpers/MovieUtils.py
index 8250a82cbbea8a065d6c781ee28f15eb53955fec..89762f454d6b6d7ef1085ea0acfcea825367f02a 100644 (file)
--- a/Mac/Contrib/ImageHelpers/MovieUtils.py
+++ b/Mac/Contrib/ImageHelpers/MovieUtils.py
@@ -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):
        

diff --git a/Mac/Demo/PICTbrowse/ICONbrowse.py b/Mac/Demo/PICTbrowse/ICONbrowse.py
index 902b5c79cc7a856873f22378716d164ae3774d93..42ae96d75f6c5ac3c2e01cd1ce0acd8d0cd64b1a 100644 (file)
--- a/Mac/Demo/PICTbrowse/ICONbrowse.py
+++ b/Mac/Demo/PICTbrowse/ICONbrowse.py
@@ -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]:

diff --git a/Mac/Demo/PICTbrowse/PICTbrowse2.py b/Mac/Demo/PICTbrowse/PICTbrowse2.py
index 0e11681cf744aa542733c95f28f7caa1349e4bec..da389c0a283e3995d57165f69507331a62994636 100644 (file)
--- a/Mac/Demo/PICTbrowse/PICTbrowse2.py
+++ b/Mac/Demo/PICTbrowse/PICTbrowse2.py
@@ -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]:

diff --git a/Mac/Demo/PICTbrowse/cicnbrowse.py b/Mac/Demo/PICTbrowse/cicnbrowse.py
index 561dcf96de3ea2d170c1c9c619969cecb88bd97c..b90143e195e122bb7017ec54dcde791414ad1260 100644 (file)
--- a/Mac/Demo/PICTbrowse/cicnbrowse.py
+++ b/Mac/Demo/PICTbrowse/cicnbrowse.py
@@ -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]:

diff --git a/Mac/Demo/imgbrowse/imgbrowse.py b/Mac/Demo/imgbrowse/imgbrowse.py
index c67f4e8085fa1c67f9895b0dda32267c1e3c13f7..b54f82b0cc6370850495b8b55c8ab591e1b41468 100644 (file)
--- a/Mac/Demo/imgbrowse/imgbrowse.py
+++ b/Mac/Demo/imgbrowse/imgbrowse.py
@@ -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()

diff --git a/Mac/Demo/mlte/mlted.py b/Mac/Demo/mlte/mlted.py
index 2ae77e78623bd10894d6f677bb60b89ec4057c5e..3f77eeedde91f0fa05db6a9c72e625c7811e519c 100644 (file)
--- a/Mac/Demo/mlte/mlted.py
+++ b/Mac/Demo/mlte/mlted.py
@@ -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)

diff --git a/Mac/Demo/quicktime/MovieInWindow.py b/Mac/Demo/quicktime/MovieInWindow.py
index 9cd4e772b067f831ecde16df8abf6283d57fcc8a..620c16c6f0b0071f749ccc20c5058e4d0f3b2efc 100644 (file)
--- a/Mac/Demo/quicktime/MovieInWindow.py
+++ b/Mac/Demo/quicktime/MovieInWindow.py
@@ -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"""

diff --git a/Mac/Demo/quicktime/VerySimplePlayer.py b/Mac/Demo/quicktime/VerySimplePlayer.py
index 4962ebb854f0df14e76e555260899c3eeb8ef9ad..aca977f07458ee6c0c47b3a08ef59da0fe66d416 100644 (file)
--- a/Mac/Demo/quicktime/VerySimplePlayer.py
+++ b/Mac/Demo/quicktime/VerySimplePlayer.py
@@ -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):

diff --git a/Mac/Demo/textedit/ped.py b/Mac/Demo/textedit/ped.py
index 6a0f8823046a11aaee5222015f312d280e6e8b8f..666615895a3b2616a93d4963888d5c18243c7a96 100644 (file)
--- a/Mac/Demo/textedit/ped.py
+++ b/Mac/Demo/textedit/ped.py
@@ -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()

diff --git a/Mac/Demo/waste/htmled.py b/Mac/Demo/waste/htmled.py
index b590b1dd617cedc9e62a122758c315dae3ae165b..3abbafaef72b5d9b66640be70d51a804fd4e172f 100644 (file)
--- a/Mac/Demo/waste/htmled.py
+++ b/Mac/Demo/waste/htmled.py
@@ -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"""

diff --git a/Mac/Demo/waste/swed.py b/Mac/Demo/waste/swed.py
index 62b027e4767ef3a3f322a179a12da9cc11191d2b..083a04c05a13011019bf938d565c1f26dbb422fa 100644 (file)
--- a/Mac/Demo/waste/swed.py
+++ b/Mac/Demo/waste/swed.py
@@ -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 = []

diff --git a/Mac/Demo/waste/wed.py b/Mac/Demo/waste/wed.py
index 14bee45f2d7b4aa0c30a97a09d47f9341d2b614a..199201b53fe2c40ecbbce6002620ecc45ff380de 100644 (file)
--- a/Mac/Demo/waste/wed.py
+++ b/Mac/Demo/waste/wed.py
@@ -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()

diff --git a/Mac/Lib/EasyDialogs.py b/Mac/Lib/EasyDialogs.py
index 8b810635ca0a090646e59f325d00aa2fa8182f6f..8e1e05607cc30a3d422e3014dd729839e77a3b35 100644 (file)
--- a/Mac/Lib/EasyDialogs.py
+++ b/Mac/Lib/EasyDialogs.py
@@ -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
 

diff --git a/Mac/Lib/FrameWork.py b/Mac/Lib/FrameWork.py
index f2f6fe20e1ae366b8c5161360dbe468e1c83cb41..24acd414619eea72291f09c04dc25766a78d6a8f 100644 (file)
--- a/Mac/Lib/FrameWork.py
+++ b/Mac/Lib/FrameWork.py
@@ -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

diff --git a/Mac/Lib/PixMapWrapper.py b/Mac/Lib/PixMapWrapper.py
index b167cc2688309655a43da9221f7ff783f955f199..bcd3e0732337de2a19ecb1eee4b66b576b259c46 100644 (file)
--- a/Mac/Lib/PixMapWrapper.py
+++ b/Mac/Lib/PixMapWrapper.py
@@ -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):

diff --git a/Mac/Lib/bgenlocations.py b/Mac/Lib/bgenlocations.py
index 28792baea68325f9af253d153b14c31b9757790d..84f358785f9d7e158cf12b6c9c80c99b0a4ef540 100644 (file)
--- a/Mac/Lib/bgenlocations.py
+++ b/Mac/Lib/bgenlocations.py
@@ -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")
 
 #

diff --git a/Mac/Tools/IDE/MacPrefs.py b/Mac/Tools/IDE/MacPrefs.py
index b1fa7cabcc9f5cac79d2b76ee24c94398071a324..716c828c33c8a1f534237a6cf1b15181cf93e350 100644 (file)
--- a/Mac/Tools/IDE/MacPrefs.py
+++ b/Mac/Tools/IDE/MacPrefs.py
@@ -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

diff --git a/Mac/Tools/IDE/PyBrowser.py b/Mac/Tools/IDE/PyBrowser.py
index 2bb1686be0a9615d0fad26f56296956d2bd4f40e..fab577ac0ba9090c35e948725435a97066e89a14 100644 (file)
--- a/Mac/Tools/IDE/PyBrowser.py
+++ b/Mac/Tools/IDE/PyBrowser.py
@@ -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)

diff --git a/Mac/Tools/IDE/PyConsole.py b/Mac/Tools/IDE/PyConsole.py
index 23f301b4ef352574af373520d080a4d1f4899ff9..9a4a44be09512e26ed00b19d147509133a4e9a87 100644 (file)
--- a/Mac/Tools/IDE/PyConsole.py
+++ b/Mac/Tools/IDE/PyConsole.py
@@ -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:

diff --git a/Mac/Tools/IDE/Splash.py b/Mac/Tools/IDE/Splash.py
index 302053f072f28dba382dfa5ca420687dd0a7009c..86009d2a814a8a587281fed269405706e9664e0e 100644 (file)
--- a/Mac/Tools/IDE/Splash.py
+++ b/Mac/Tools/IDE/Splash.py
@@ -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)

diff --git a/Mac/Tools/IDE/Wbase.py b/Mac/Tools/IDE/Wbase.py
index c63aa77ec7c6301f47429fb0a14ee6b50a483042..f988ce7a7a02ee6f70102cb4849204f8003cf1a8 100644 (file)
--- a/Mac/Tools/IDE/Wbase.py
+++ b/Mac/Tools/IDE/Wbase.py
@@ -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,

diff --git a/Mac/Tools/IDE/Wcontrols.py b/Mac/Tools/IDE/Wcontrols.py
index ab6ae966e2f7295755a8940d9615427af990854f..3d523836370793f81c25660496d7f5c6723581fc 100644 (file)
--- a/Mac/Tools/IDE/Wcontrols.py
+++ b/Mac/Tools/IDE/Wcontrols.py
@@ -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:

diff --git a/Mac/Tools/IDE/Wlists.py b/Mac/Tools/IDE/Wlists.py
index 2be1a9cc4403f13d1cd004ba3fbce3385655c1a2..4f0e49bc7798ad08c63cae181df06a96e054bcfb 100644 (file)
--- a/Mac/Tools/IDE/Wlists.py
+++ b/Mac/Tools/IDE/Wlists.py
@@ -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)

diff --git a/Mac/Tools/IDE/Wtext.py b/Mac/Tools/IDE/Wtext.py
index 86c79c3f03a4bb77652011a9dc49384cf8c3f753..d611c734644761db5cbbfbeef287e685d31e19f7 100644 (file)
--- a/Mac/Tools/IDE/Wtext.py
+++ b/Mac/Tools/IDE/Wtext.py
@@ -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()

diff --git a/Mac/Tools/IDE/Wwindows.py b/Mac/Tools/IDE/Wwindows.py
index ffab76c5806e79ce428d4fe9af3be7c130912f1f..d646bcf905f545375b84d06f6d6df17cdede8024 100644 (file)
--- a/Mac/Tools/IDE/Wwindows.py
+++ b/Mac/Tools/IDE/Wwindows.py
@@ -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