[Python-checkins] python/dist/src/Mac/Lib EasyDialogs.py,1.39,1.40 FrameWork.py,1.53,1.54 PixMapWrapper.py,1.3,1.4 bgenlocations.py,1.1,1.2
jackjansen@users.sourceforge.net
jackjansen@users.sourceforge.net
Fri, 29 Nov 2002 16:01:56 -0800
Update of /cvsroot/python/python/dist/src/Mac/Lib
In directory sc8-pr-cvs1:/tmp/cvs-serv20028/Lib
Modified Files:
EasyDialogs.py FrameWork.py PixMapWrapper.py bgenlocations.py
Log Message:
Lots of minor tweaks for the pep252 checkins, mainly because Qd
attributes are no longer supported.
Index: EasyDialogs.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Lib/EasyDialogs.py,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** EasyDialogs.py 7 Nov 2002 23:07:04 -0000 1.39
--- EasyDialogs.py 30 Nov 2002 00:01:23 -0000 1.40
***************
*** 223,227 ****
! screenbounds = Qd.qd.screenBits.bounds
screenbounds = screenbounds[0]+4, screenbounds[1]+4, \
screenbounds[2]-4, screenbounds[3]-4
--- 223,227 ----
! screenbounds = Qd.GetQDGlobalsScreenBits().bounds
screenbounds = screenbounds[0]+4, screenbounds[1]+4, \
screenbounds[2]-4, screenbounds[3]-4
Index: FrameWork.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Lib/FrameWork.py,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** FrameWork.py 10 Sep 2002 12:22:32 -0000 1.53
--- FrameWork.py 30 Nov 2002 00:01:24 -0000 1.54
***************
*** 69,73 ****
# The useable portion of the screen
# ## but what happens with multiple screens? jvr
! screenbounds = qd.screenBits.bounds
screenbounds = screenbounds[0]+4, screenbounds[1]+4, \
screenbounds[2]-4, screenbounds[3]-4
--- 69,73 ----
# The useable portion of the screen
# ## but what happens with multiple screens? jvr
! screenbounds = GetQDGlobalsScreenBits().bounds
screenbounds = screenbounds[0]+4, screenbounds[1]+4, \
screenbounds[2]-4, screenbounds[3]-4
***************
*** 98,102 ****
def setarrowcursor():
! SetCursor(qd.arrow)
class Application:
--- 98,102 ----
def setarrowcursor():
! SetCursor(GetQDGlobalsArrow())
class Application:
***************
*** 809,813 ****
def do_resize(self, width, height, window):
! l, t, r, b = self.wid.GetWindowPort().portRect # jvr, forGrowIcon
self.SetPort() # jvr
self.wid.InvalWindowRect((r - SCROLLBARWIDTH + 1, b - SCROLLBARWIDTH + 1, r, b)) # jvr
--- 809,813 ----
def do_resize(self, width, height, window):
! 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
***************
*** 817,821 ****
def do_postresize(self, width, height, window):
SetPort(window)
! self.wid.InvalWindowRect(window.GetWindowPort().portRect)
def do_inContent(self, partcode, window, event):
--- 817,821 ----
def do_postresize(self, width, height, window):
SetPort(window)
! self.wid.InvalWindowRect(window.GetWindowPort().GetPortBounds())
def do_inContent(self, partcode, window, event):
***************
*** 850,854 ****
time.sleep(0.1)
InvertRgn(window.GetWindowPort().visRgn)
! FillRgn(window.GetWindowPort().visRgn, qd.gray)
else:
EraseRgn(window.GetWindowPort().visRgn)
--- 850,854 ----
time.sleep(0.1)
InvertRgn(window.GetWindowPort().visRgn)
! FillRgn(window.GetWindowPort().visRgn, GetQDGlobalsGray())
else:
EraseRgn(window.GetWindowPort().visRgn)
***************
*** 903,907 ****
self.barx = self.bary = None
self.barx_enabled = self.bary_enabled = 1
! x0, y0, x1, y1 = self.wid.GetWindowPort().portRect
vx, vy = self.getscrollbarvalues()
if vx == None: self.barx_enabled, vx = 0, 0
--- 903,907 ----
self.barx = self.bary = None
self.barx_enabled = self.bary_enabled = 1
! x0, y0, x1, y1 = self.wid.GetWindowPort().GetPortBounds()
vx, vy = self.getscrollbarvalues()
if vx == None: self.barx_enabled, vx = 0, 0
***************
*** 939,943 ****
def do_postresize(self, width, height, window):
! l, t, r, b = self.wid.GetWindowPort().portRect
self.SetPort()
if self.barx:
--- 939,943 ----
def do_postresize(self, width, height, window):
! l, t, r, b = self.wid.GetWindowPort().GetPortBounds()
self.SetPort()
if self.barx:
Index: PixMapWrapper.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Lib/PixMapWrapper.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PixMapWrapper.py 25 Aug 2001 12:08:49 -0000 1.3
--- PixMapWrapper.py 30 Nov 2002 00:01:24 -0000 1.4
***************
*** 152,156 ****
dest[3] = y1 + src[3]-src[1]
if not port: port = Qd.GetPort()
! Qd.CopyBits(self.PixMap(), port.portBits, src, tuple(dest),
QuickDraw.srcCopy, None)
--- 152,156 ----
dest[3] = y1 + src[3]-src[1]
if not port: port = Qd.GetPort()
! Qd.CopyBits(self.PixMap(), port.GetPortBitMapForCopyBits(), src, tuple(dest),
QuickDraw.srcCopy, None)
Index: bgenlocations.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Lib/bgenlocations.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** bgenlocations.py 5 Aug 2002 14:56:04 -0000 1.1
--- bgenlocations.py 30 Nov 2002 00:01:24 -0000 1.2
***************
*** 29,33 ****
_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/"
INCLUDEDIR=os.path.join(_MWERKSDIR, "MacOS Support", "Universal", "Interfaces", "CIncludes")
--- 29,33 ----
_MWERKSDIR="Macintosh HD:Applications (Mac OS 9):Metrowerks CodeWarrior 7.0:Metrowerks CodeWarrior"
else:
! _MWERKSDIR="/Volumes/Moes/Applications (Mac OS 9)/Metrowerks CodeWarrior 7.0/Metrowerks CodeWarrior/"
INCLUDEDIR=os.path.join(_MWERKSDIR, "MacOS Support", "Universal", "Interfaces", "CIncludes")