Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit d13c385

Browse files
jackjansenjackjansen
committed
Replaced OpenResFile calls with FSpOpenResFile calls (which are carbon-compatible).
1 parent 3c0d013 commit d13c385

14 files changed

Lines changed: 21 additions & 21 deletions

‎Mac/Lib/cfmfile.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def mergecfmfiles(srclist, dst, architecture = 'fat'):
3434
dst = dst.as_pathname()
3535

3636
dstfile = open(dst, "wb")
37-
rf = Res.OpenResFile(dst)
37+
rf = Res.FSpOpenResFile(dst, 3)
3838
try:
3939
dstcfrg = CfrgResource()
4040
for src in srclist:
@@ -64,7 +64,7 @@ def __init__(self, path = None):
6464
self.path = path
6565
if path is not None and os.path.exists(path):
6666
currentresref = Res.CurResFile()
67-
resref = Res.OpenResFile(path)
67+
resref = Res.FSpOpenResFile(path, 1)
6868
Res.UseResFile(resref)
6969
try:
7070
try:

‎Mac/Lib/test/tlist_dialog.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ def dodialog(items):
7171

7272
def test():
7373
import os, sys
74-
Res.OpenResFile('tlist_dialog.rsrc')
74+
Res.FSpOpenResFile('tlist_dialog.rsrc', 1)
7575
dodialog(os.listdir(':'))
7676
sys.exit(1)
7777

‎Mac/Tools/CGI/BuildCGIApplet.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def mkcgifilename(filename):
6464
def buildone(template, wrapper, src, dst):
6565
buildtools.process(template, wrapper, dst, 1)
6666
# write source as a PYC resource into dst
67-
ref = Res.OpenResFile(dst)
67+
ref = Res.FSpOpenResFile(dst, 1)
6868
try:
6969
Res.UseResFile(ref)
7070
py_resource.frompyfile(src, "CGI_MAIN", preload=1)

‎Mac/Tools/IDE/BuildIDE.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
buildtools.process(template, mainfilename, dstfilename, 1)
2121

22-
targetref = Res.OpenResFile(dstfilename)
22+
targetref = Res.FSpOpenResFile(dstfilename, 3)
2323
Res.UseResFile(targetref)
2424

2525
files = os.listdir(ide_home)
@@ -36,6 +36,6 @@
3636
ispackage=0)
3737

3838
# add W resources
39-
wresref = Res.OpenResFile(os.path.join(ide_home, "Widgets.rsrc"))
39+
wresref = Res.FSpOpenResFile(os.path.join(ide_home, "Widgets.rsrc"), 1)
4040
buildtools.copyres(wresref, targetref, [], 0)
4141

‎Mac/Tools/IDE/PyEdit.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ def __init__(self, path = "", title = ""):
114114

115115
def readwindowsettings(self):
116116
try:
117-
resref = Res.OpenResFile(self.path)
117+
resref = Res.FSpOpenResFile(self.path, 1)
118118
except Res.Error:
119119
return
120120
try:
@@ -127,10 +127,10 @@ def readwindowsettings(self):
127127

128128
def writewindowsettings(self):
129129
try:
130-
resref = Res.OpenResFile(self.path)
130+
resref = Res.FSpOpenResFile(self.path, 3)
131131
except Res.Error:
132132
Res.CreateResFile(self.path)
133-
resref = Res.OpenResFile(self.path)
133+
resref = Res.FSpOpenResFile(self.path, 3)
134134
try:
135135
data = Res.Resource(marshal.dumps(self.settings))
136136
Res.UseResFile(resref)

‎Mac/Tools/macfreeze/macfreezegui.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ def dialog(script=None):
6060
d = None
6161
if d == None:
6262
try:
63-
Res.OpenResFile('macfreeze.rsrc')
63+
Res.FSpOpenResFile('macfreeze.rsrc', 1)
6464
except Res.Error:
6565
d = None
6666
else:

‎Mac/Tools/macfreeze/macgen_bin.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def generate(input, output, module_dict=None, architecture='fat', debug=0):
3939
print 'Adding "__main__"'
4040
buildtools.process(applettemplatepath, input, output, 0)
4141

42-
outputref = Res.OpenResFile(output)
42+
outputref = Res.FSpOpenResFile(output, 3)
4343
try:
4444
Res.UseResFile(outputref)
4545

@@ -171,10 +171,10 @@ def makefilenames(name):
171171
def copyres(input, output, *args, **kwargs):
172172
openedin = openedout = 0
173173
if type(input) == types.StringType:
174-
input = Res.OpenResFile(input)
174+
input = Res.FSpOpenResFile(input, 1)
175175
openedin = 1
176176
if type(output) == types.StringType:
177-
output = Res.OpenResFile(output)
177+
output = Res.FSpOpenResFile(output, 3)
178178
openedout = 1
179179
try:
180180
apply(buildtools.copyres, (input, output) + args, kwargs)

‎Mac/Tools/twit/mactwit_app.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ def Initialize():
260260
dummy = Res.GetResource('DLOG', ID_MODULES)
261261
except Res.Error:
262262
try:
263-
Res.OpenResFile("Twit.rsrc")
263+
Res.FSpOpenResFile("Twit.rsrc", 1)
264264
except Res.Error, arg:
265265
EasyDialogs.Message("Cannot open Twit.rsrc: "+arg[1])
266266
sys.exit(1)

‎Mac/Tools/twit/mactwit_browser.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def Initialize():
6161
ourparentdir = os.path.split(openresfile.func_code.co_filename)[0]
6262
os.chdir(ourparentdir)
6363
try:
64-
Res.OpenResFile("mactwit_browse.rsrc")
64+
Res.FSpOpenResFile("mactwit_browse.rsrc", 1)
6565
except Res.Error, arg:
6666
EasyDialogs.Message("Cannot open mactwit_browse.rsrc: "+arg[1])
6767
sys.exit(1)

‎Mac/scripts/BuildApplication.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
try:
3939
Res.GetResource('DITL', DLG_ID)
4040
except Res.Error:
41-
Res.OpenResFile("BuildApplication.rsrc")
41+
Res.FSpOpenResFile("BuildApplication.rsrc", 1)
4242
else:
4343
pass # we're an applet
4444

0 commit comments

Comments
 (0)