suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix Mac OS X problems related to new use fo Cocoa for fonts

Browse Source 
svn: r6652
This commit is contained in:
Matthew Flatt 2007-06-13 21:50:57 +00:00
parent c44c595e4d
commit 88683ccc37
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mred/Makefile.in
View File

@ -134,7 +134,7 @@ $(MRFW) : $(MZSCHEMEDEPS) $(MREDOBJECTS) $(@WXLIBS@) $(MRSTATIC_STUB)
$(MREDLINKER) $(MREDLDFLAGS) -dynamiclib -o $(MRFW) -Wl,-headerpad_max_install_names ../mzscheme/libmzscheme.@LIBSFX@ ../mzscheme/libmzgc.@LIBSFX@ $(@WXLIBS@) $(GUILIBS_@WXVARIANT@) @X_EXTRA_LIBS@ $(MREDLINKER) $(MREDLDFLAGS) -dynamiclib -o $(MRFW) -Wl,-headerpad_max_install_names ../mzscheme/libmzscheme.@LIBSFX@ ../mzscheme/libmzgc.@LIBSFX@ $(@WXLIBS@) $(GUILIBS_@WXVARIANT@) @X_EXTRA_LIBS@
MrEd@CGC@.app/Contents/MacOS/MrEd@CGC@: $(MRFWRES) $(MRFW) mrmain.@LTO@ MrEd@CGC@.app/Contents/MacOS/MrEd@CGC@: $(MRFWRES) $(MRFW) mrmain.@LTO@
$(MREDLINKER) -o MrEd@CGC@.app/Contents/MacOS/MrEd@CGC@ mrmain.@LTO@ -Wl,-headerpad_max_install_names -F. -framework PLT_MrEd -framework Carbon @PROFFLAGS@ $(MREDLINKER) -o MrEd@CGC@.app/Contents/MacOS/MrEd@CGC@ mrmain.@LTO@ -Wl,-headerpad_max_install_names -F. -framework PLT_MrEd -framework Carbon -framework Cocoa @PROFFLAGS@
/usr/bin/install_name_tool -change "PLT_MrEd.framework/Versions/$(FWVERSION)/PLT_MrEd" "@executable_path/../../../PLT_MrEd.framework/Versions/$(FWVERSION)/PLT_MrEd" MrEd@CGC@.app/Contents/MacOS/MrEd@CGC@ /usr/bin/install_name_tool -change "PLT_MrEd.framework/Versions/$(FWVERSION)/PLT_MrEd" "@executable_path/../../../PLT_MrEd.framework/Versions/$(FWVERSION)/PLT_MrEd" MrEd@CGC@.app/Contents/MacOS/MrEd@CGC@
$(MRFWRES): $(srcdir)/../mac/osx_appl.ss $(srcdir)/../mac/cw/MrEd.r $(MRFWRES): $(srcdir)/../mac/osx_appl.ss $(srcdir)/../mac/cw/MrEd.r

2
src/mred/gc2/Makefile.in
View File

@ -1371,7 +1371,7 @@ MRFW = PLT_MrEd.framework/Versions/$(FWVERSION)_3m/PLT_MrEd
MRFWRES = PLT_MrEd.framework/Versions/$(FWVERSION)_3m/Resources/PLT_MrEd.rsrc MRFWRES = PLT_MrEd.framework/Versions/$(FWVERSION)_3m/Resources/PLT_MrEd.rsrc
../MrEd@MMM@.app/Contents/MacOS/MrEd@MMM@: $(MRFWRES) $(MRFW) mrmain.@LTO@ ../MrEd@MMM@.app/Contents/MacOS/MrEd@MMM@: $(MRFWRES) $(MRFW) mrmain.@LTO@
$(MREDLINKER) -o ../MrEd@MMM@.app/Contents/MacOS/MrEd@MMM@ mrmain.@LTO@ -Wl,-headerpad_max_install_names -F. -framework PLT_MrEd -framework Carbon $(MREDLINKER) -o ../MrEd@MMM@.app/Contents/MacOS/MrEd@MMM@ mrmain.@LTO@ -Wl,-headerpad_max_install_names -F. -framework PLT_MrEd -framework Carbon -framework Cocoa
mkdir -p "../PLT_MrEd.framework/Versions/$(FWVERSION)_3m" mkdir -p "../PLT_MrEd.framework/Versions/$(FWVERSION)_3m"
cp "$(MRFW)" "../$(MRFW)" cp "$(MRFW)" "../$(MRFW)"
rm -rf "../PLT_MrEd.framework/Versions/$(FWVERSION)_3m/Resources" rm -rf "../PLT_MrEd.framework/Versions/$(FWVERSION)_3m/Resources"

9
src/wxmac/src/mac/wx_font.m
View File

@ -9,6 +9,8 @@ int wx_isFamilyFixedWidth(FMFontFamily fam)
{ {
FMFont fnt; FMFont fnt;
StyleParameter intrinsic; StyleParameter intrinsic;
int is_fw = 0;
id pool = [[NSAutoreleasePool alloc] init];
if (!FMGetFontFromFontFamilyInstance(fam, 0, &fnt, &intrinsic)) { if (!FMGetFontFromFontFamilyInstance(fam, 0, &fnt, &intrinsic)) {
ATSFontRef ats; ATSFontRef ats;
@ -19,10 +21,13 @@ int wx_isFamilyFixedWidth(FMFontFamily fam)
if (!ATSFontGetPostScriptName(ats, kATSOptionFlagsDefault, &ref)) { if (!ATSFontGetPostScriptName(ats, kATSOptionFlagsDefault, &ref)) {
nsfnt = [NSFont fontWithName: (NSString *)ref size: 12]; nsfnt = [NSFont fontWithName: (NSString *)ref size: 12];
CFRelease(ref); CFRelease(ref);
return [nsfnt isFixedPitch]; [pool release];
is_fw = [nsfnt isFixedPitch];
} }
} }
} }
return 0; [pool release];
return is_fw;
} }