From 34b896e50fa154ad890a458c60932964421e739f Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Fri, 16 Jan 2009 19:26:07 -0800 Subject: [PATCH] XQuartz: SnowLeopard: Help system book name changed in 10.6 (cherry picked from commit b57cb05c69acbedb00a97234099ea104309aa2cb) --- hw/xquartz/X11Controller.m | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m index 9b30fa6bb..adf861ca9 100644 --- a/hw/xquartz/X11Controller.m +++ b/hw/xquartz/X11Controller.m @@ -687,18 +687,19 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn row:(int)row [prefs_panel makeKeyAndOrderFront:sender]; } -- (IBAction) quit:sender -{ - DarwinSendDDXEvent(kXquartzQuit, 0); +- (IBAction) quit:sender { + DarwinSendDDXEvent(kXquartzQuit, 0); } -- (IBAction) x11_help:sender -{ - AHLookupAnchor ((CFStringRef)NSLocalizedString(@"Mac Help", no comment), CFSTR ("mchlp2276")); +- (IBAction) x11_help:sender { +#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060 + AHLookupAnchor((CFStringRef)NSLocalizedString(@"Mac Help", no comment), CFSTR("mchlp2276")); +#else + AHLookupAnchor(CFSTR("com.apple.machelp"), CFSTR("mchlp2276")); +#endif } -- (OSX_BOOL) validateMenuItem:(NSMenuItem *)item -{ +- (OSX_BOOL) validateMenuItem:(NSMenuItem *)item { NSMenu *menu = [item menu]; if (item == toggle_fullscreen_item)