Replaced OpenResFile calls with FSpOpenResFile calls (which are carbon-compatible).
This commit is contained in:
parent
3c0d013db4
commit
d13c385462
|
@ -34,7 +34,7 @@ def mergecfmfiles(srclist, dst, architecture = 'fat'):
|
|||
dst = dst.as_pathname()
|
||||
|
||||
dstfile = open(dst, "wb")
|
||||
rf = Res.OpenResFile(dst)
|
||||
rf = Res.FSpOpenResFile(dst, 3)
|
||||
try:
|
||||
dstcfrg = CfrgResource()
|
||||
for src in srclist:
|
||||
|
@ -64,7 +64,7 @@ class CfrgResource:
|
|||
self.path = path
|
||||
if path is not None and os.path.exists(path):
|
||||
currentresref = Res.CurResFile()
|
||||
resref = Res.OpenResFile(path)
|
||||
resref = Res.FSpOpenResFile(path, 1)
|
||||
Res.UseResFile(resref)
|
||||
try:
|
||||
try:
|
||||
|
|
|
@ -71,7 +71,7 @@ def dodialog(items):
|
|||
|
||||
def test():
|
||||
import os, sys
|
||||
Res.OpenResFile('tlist_dialog.rsrc')
|
||||
Res.FSpOpenResFile('tlist_dialog.rsrc', 1)
|
||||
dodialog(os.listdir(':'))
|
||||
sys.exit(1)
|
||||
|
||||
|
|
|
@ -64,7 +64,7 @@ def mkcgifilename(filename):
|
|||
def buildone(template, wrapper, src, dst):
|
||||
buildtools.process(template, wrapper, dst, 1)
|
||||
# write source as a PYC resource into dst
|
||||
ref = Res.OpenResFile(dst)
|
||||
ref = Res.FSpOpenResFile(dst, 1)
|
||||
try:
|
||||
Res.UseResFile(ref)
|
||||
py_resource.frompyfile(src, "CGI_MAIN", preload=1)
|
||||
|
|
|
@ -19,7 +19,7 @@ dstfilename = os.path.join(sys.exec_prefix, "Python IDE")
|
|||
|
||||
buildtools.process(template, mainfilename, dstfilename, 1)
|
||||
|
||||
targetref = Res.OpenResFile(dstfilename)
|
||||
targetref = Res.FSpOpenResFile(dstfilename, 3)
|
||||
Res.UseResFile(targetref)
|
||||
|
||||
files = os.listdir(ide_home)
|
||||
|
@ -36,6 +36,6 @@ for name in files:
|
|||
ispackage=0)
|
||||
|
||||
# add W resources
|
||||
wresref = Res.OpenResFile(os.path.join(ide_home, "Widgets.rsrc"))
|
||||
wresref = Res.FSpOpenResFile(os.path.join(ide_home, "Widgets.rsrc"), 1)
|
||||
buildtools.copyres(wresref, targetref, [], 0)
|
||||
|
||||
|
|
|
@ -114,7 +114,7 @@ class Editor(W.Window):
|
|||
|
||||
def readwindowsettings(self):
|
||||
try:
|
||||
resref = Res.OpenResFile(self.path)
|
||||
resref = Res.FSpOpenResFile(self.path, 1)
|
||||
except Res.Error:
|
||||
return
|
||||
try:
|
||||
|
@ -127,10 +127,10 @@ class Editor(W.Window):
|
|||
|
||||
def writewindowsettings(self):
|
||||
try:
|
||||
resref = Res.OpenResFile(self.path)
|
||||
resref = Res.FSpOpenResFile(self.path, 3)
|
||||
except Res.Error:
|
||||
Res.CreateResFile(self.path)
|
||||
resref = Res.OpenResFile(self.path)
|
||||
resref = Res.FSpOpenResFile(self.path, 3)
|
||||
try:
|
||||
data = Res.Resource(marshal.dumps(self.settings))
|
||||
Res.UseResFile(resref)
|
||||
|
|
|
@ -60,7 +60,7 @@ def dialog(script=None):
|
|||
d = None
|
||||
if d == None:
|
||||
try:
|
||||
Res.OpenResFile('macfreeze.rsrc')
|
||||
Res.FSpOpenResFile('macfreeze.rsrc', 1)
|
||||
except Res.Error:
|
||||
d = None
|
||||
else:
|
||||
|
|
|
@ -39,7 +39,7 @@ def generate(input, output, module_dict=None, architecture='fat', debug=0):
|
|||
print 'Adding "__main__"'
|
||||
buildtools.process(applettemplatepath, input, output, 0)
|
||||
|
||||
outputref = Res.OpenResFile(output)
|
||||
outputref = Res.FSpOpenResFile(output, 3)
|
||||
try:
|
||||
Res.UseResFile(outputref)
|
||||
|
||||
|
@ -171,10 +171,10 @@ def makefilenames(name):
|
|||
def copyres(input, output, *args, **kwargs):
|
||||
openedin = openedout = 0
|
||||
if type(input) == types.StringType:
|
||||
input = Res.OpenResFile(input)
|
||||
input = Res.FSpOpenResFile(input, 1)
|
||||
openedin = 1
|
||||
if type(output) == types.StringType:
|
||||
output = Res.OpenResFile(output)
|
||||
output = Res.FSpOpenResFile(output, 3)
|
||||
openedout = 1
|
||||
try:
|
||||
apply(buildtools.copyres, (input, output) + args, kwargs)
|
||||
|
|
|
@ -260,7 +260,7 @@ def Initialize():
|
|||
dummy = Res.GetResource('DLOG', ID_MODULES)
|
||||
except Res.Error:
|
||||
try:
|
||||
Res.OpenResFile("Twit.rsrc")
|
||||
Res.FSpOpenResFile("Twit.rsrc", 1)
|
||||
except Res.Error, arg:
|
||||
EasyDialogs.Message("Cannot open Twit.rsrc: "+arg[1])
|
||||
sys.exit(1)
|
||||
|
|
|
@ -61,7 +61,7 @@ def Initialize():
|
|||
ourparentdir = os.path.split(openresfile.func_code.co_filename)[0]
|
||||
os.chdir(ourparentdir)
|
||||
try:
|
||||
Res.OpenResFile("mactwit_browse.rsrc")
|
||||
Res.FSpOpenResFile("mactwit_browse.rsrc", 1)
|
||||
except Res.Error, arg:
|
||||
EasyDialogs.Message("Cannot open mactwit_browse.rsrc: "+arg[1])
|
||||
sys.exit(1)
|
||||
|
|
|
@ -38,7 +38,7 @@ GEN68K_BUTTON = 6
|
|||
try:
|
||||
Res.GetResource('DITL', DLG_ID)
|
||||
except Res.Error:
|
||||
Res.OpenResFile("BuildApplication.rsrc")
|
||||
Res.FSpOpenResFile("BuildApplication.rsrc", 1)
|
||||
else:
|
||||
pass # we're an applet
|
||||
|
||||
|
|
|
@ -170,7 +170,7 @@ def edit_applet(name):
|
|||
|
||||
def main():
|
||||
try:
|
||||
h = OpenResFile('EditPythonPrefs.rsrc')
|
||||
h = FSpOpenResFile('EditPythonPrefs.rsrc', 1)
|
||||
except Res.Error:
|
||||
pass # Assume we already have acces to our own resource
|
||||
|
||||
|
|
|
@ -321,7 +321,7 @@ def GetType():
|
|||
|
||||
def InitUI():
|
||||
"""Initialize stuff needed by UI (a resource file)"""
|
||||
Res.OpenResFile('MkDistr.rsrc')
|
||||
Res.FSpOpenResFile('MkDistr.rsrc', 1)
|
||||
|
||||
class _testerhelp:
|
||||
def __init__(self, which):
|
||||
|
@ -340,7 +340,7 @@ class _testerhelp:
|
|||
class _test:
|
||||
def __init__(self):
|
||||
import sys
|
||||
Res.OpenResFile('MkDistr.rsrc')
|
||||
Res.FSpOpenResFile('MkDistr.rsrc', 1)
|
||||
self.inc = _testerhelp('include')
|
||||
self.exc = _testerhelp('exclude')
|
||||
self.ui = MkDistrUI(self)
|
||||
|
|
|
@ -85,7 +85,7 @@ def main():
|
|||
curdir = os.getcwd()
|
||||
import Res
|
||||
try:
|
||||
Res.OpenResFile('RunLibScript.rsrc')
|
||||
Res.FSpOpenResFile('RunLibScript.rsrc', 1)
|
||||
except:
|
||||
pass # Assume we're an applet already
|
||||
name, argv, stdin, stdout, wdir, pause = interact()
|
||||
|
|
|
@ -270,7 +270,7 @@ def incbuildno(filename):
|
|||
|
||||
def main():
|
||||
try:
|
||||
h = Res.OpenResFile('fullbuild.rsrc')
|
||||
h = Res.FSpOpenResFile('fullbuild.rsrc', 1)
|
||||
except Res.Error:
|
||||
pass # Assume we already have acces to our own resource
|
||||
|
||||
|
|
Loading…
Reference in New Issue