xserver: Branch 'xorg-server-1.5-apple'
Jeremy Huddleston
jeremyhu at kemper.freedesktop.org
Sun Jan 25 21:26:20 PST 2009
hw/xquartz/X11Controller.m | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
New commits:
commit b231fb1f358c9fb10181d97fa8cbc8fdfcf8c618
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date: Fri Jan 16 19:26:07 2009 -0800
XQuartz: SnowLeopard: Help system book name changed in 10.6
(cherry picked from commit b57cb05c69acbedb00a97234099ea104309aa2cb)
diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m
index 9b30fa6..adf861c 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)
More information about the xorg-commit
mailing list