summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@freedesktop.org>2009-01-16 19:26:07 -0800
committerJeremy Huddleston <jeremyhu@freedesktop.org>2009-01-16 19:26:07 -0800
commitb57cb05c69acbedb00a97234099ea104309aa2cb (patch)
tree0363c0228ae1d560f8f0c42a7d9d11f9567e152d
parent94e417ac87a98cd5c6bf2d7c495d702748398931 (diff)
XQuartz: SnowLeopard: Help system book name changed in 10.6
-rw-r--r--hw/xquartz/X11Controller.m17
1 files 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
@@ -684,24 +684,25 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn row:(int)row
[enable_fullscreen_menu setEnabled:!quartzEnableRootless];
[enable_fullscreen_menu setIntValue:quartzFullscreenMenu];
[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)
return !quartzEnableRootless;
else if (item == copy_menu_item) // For some reason, this isn't working...
return NO;