diff options
| author | das <das> | 2006-07-20 06:25:18 (GMT) |
|---|---|---|
| committer | das <das> | 2006-07-20 06:25:18 (GMT) |
| commit | 472701c8e65c0becd4620bce71070564d0569287 (patch) | |
| tree | 908cf8a88b6a313743cec6481241735b0ff1f9d2 /unix/tkUnix.c | |
| parent | 516d2a2413bfa3330b641f88c3a940a54f790a60 (diff) | |
| download | tk-472701c8e65c0becd4620bce71070564d0569287.zip tk-472701c8e65c0becd4620bce71070564d0569287.tar.gz tk-472701c8e65c0becd4620bce71070564d0569287.tar.bz2 | |
* macosx/tkMacOSXWm.c (WmAttributesCmd, WmIconbitmapCmd): add support
* unix/tkUnixSend.c (Tk_GetUserInactiveTime): for weakly
importing symbols not available on OSX 10.2 or 10.3, enables binaires
built on later OSX versions to run on earlier ones.
* macosx/Wish.xcodeproj/project.pbxproj: enable weak-linking; turn on
extra warnings.
* macosx/README: document how to enable weak-linking; cleanup.
* unix/configure.in: add check on Darwin-X11 for ld support of -weak-l
* unix/tcl.m4: flag and weak-link libXss if possible as it is not
available before OSX 10.4; enforce requirement of OSX 10.2 for TkAqua;
move Darwin specific checks & defines that are only relevant to the tcl
build out of tcl.m4; restrict framework option to Darwin; cleanup
quoting and help messages.
* unix/configure: autoconf-2.59
* unix/tkConfig.h.in: autoheader-2.59
* macosx/GNUmakefile: enable xft for TkX11 build.
* macosx/tkMacOSXFont.c (TkMacOSXQuarzStartDraw, TkMacOSXQuarzEndDraw):
verify validity of context returned from QDBeginCGContext() before use.
* macosx/tkMacOSXKeyEvent.c: ifdef out diagnostic messages to stderr.
* macosx/tkMacOSXEvent.h: standardize MAC_OS_X_VERSION_MAX_ALLOWED
* macosx/tkMacOSXMenu.c: checks per QA1316, ensure define can be
* macosx/tkMacOSXMenubutton.c: overriden on command line (from default
* macosx/tkMacOSXMenus.c: of current OS version).
* macosx/tkMacOSXMouseEvent.c:
* macosx/tkMacOSXWm.c:
* macosx/tkMacOSXFont.c (TkpMeasureCharsInContext): fix
signed-with-unsigned comparison and other warnings from gcc4 -Wextra.
Diffstat (limited to 'unix/tkUnix.c')
| -rw-r--r-- | unix/tkUnix.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/unix/tkUnix.c b/unix/tkUnix.c index 2e174b7..993bc9d 100644 --- a/unix/tkUnix.c +++ b/unix/tkUnix.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkUnix.c,v 1.12 2005/11/14 11:54:21 dkf Exp $ + * RCS: @(#) $Id: tkUnix.c,v 1.13 2006/07/20 06:25:20 das Exp $ */ #include <tkInt.h> @@ -209,7 +209,11 @@ Tk_GetUserInactiveTime( * on some buggy versions of XFree86. */ - if (XScreenSaverQueryExtension(dpy, &eventBase, &errorBase) && + if ( +#ifdef __APPLE__ + XScreenSaverQueryInfo != NULL && /* Support for weak-linked libXss. */ +#endif + XScreenSaverQueryExtension(dpy, &eventBase, &errorBase) && XScreenSaverQueryVersion(dpy, &major, &minor)) { XScreenSaverInfo *info = XScreenSaverAllocInfo(); |