diff --git a/src/mred/Makefile.in b/src/mred/Makefile.in index 234a80deec..2e702008c2 100644 --- a/src/mred/Makefile.in +++ b/src/mred/Makefile.in @@ -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@ 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@ $(MRFWRES): $(srcdir)/../mac/osx_appl.ss $(srcdir)/../mac/cw/MrEd.r diff --git a/src/mred/gc2/Makefile.in b/src/mred/gc2/Makefile.in index 7b51b0c60d..d69f303df4 100644 --- a/src/mred/gc2/Makefile.in +++ b/src/mred/gc2/Makefile.in @@ -1371,7 +1371,7 @@ MRFW = PLT_MrEd.framework/Versions/$(FWVERSION)_3m/PLT_MrEd MRFWRES = PLT_MrEd.framework/Versions/$(FWVERSION)_3m/Resources/PLT_MrEd.rsrc ../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" cp "$(MRFW)" "../$(MRFW)" rm -rf "../PLT_MrEd.framework/Versions/$(FWVERSION)_3m/Resources" diff --git a/src/wxmac/src/mac/wx_font.m b/src/wxmac/src/mac/wx_font.m index e3b19fc4d5..7ead69ce95 100644 --- a/src/wxmac/src/mac/wx_font.m +++ b/src/wxmac/src/mac/wx_font.m @@ -9,6 +9,8 @@ int wx_isFamilyFixedWidth(FMFontFamily fam) { FMFont fnt; StyleParameter intrinsic; + int is_fw = 0; + id pool = [[NSAutoreleasePool alloc] init]; if (!FMGetFontFromFontFamilyInstance(fam, 0, &fnt, &intrinsic)) { ATSFontRef ats; @@ -19,10 +21,13 @@ int wx_isFamilyFixedWidth(FMFontFamily fam) if (!ATSFontGetPostScriptName(ats, kATSOptionFlagsDefault, &ref)) { nsfnt = [NSFont fontWithName: (NSString *)ref size: 12]; CFRelease(ref); - return [nsfnt isFixedPitch]; + [pool release]; + is_fw = [nsfnt isFixedPitch]; } } } - return 0; + [pool release]; + + return is_fw; }