summaryrefslogtreecommitdiffstats
path: root/macosx/tkMacOSXWm.c
diff options
context:
space:
mode:
authordas <das>2007-06-09 17:09:39 (GMT)
committerdas <das>2007-06-09 17:09:39 (GMT)
commit00da9d704110e07f22779330047d0b99406dd2ce (patch)
treef359d2dd182768b18f13b4636ebdc5c225ffa0f8 /macosx/tkMacOSXWm.c
parenta700737d94005b30448cf6028feee89c787ed748 (diff)
downloadtk-00da9d704110e07f22779330047d0b99406dd2ce.zip
tk-00da9d704110e07f22779330047d0b99406dd2ce.tar.gz
tk-00da9d704110e07f22779330047d0b99406dd2ce.tar.bz2
* macosx/tkMacOSXColor.c: fix issues with TK_{IF,ELSE,ENDIF} macros;
* macosx/tkMacOSXDraw.c: implement Jaguar equivalent of unavailable * macosx/tkMacOSXEntry.c: kHIToolboxVersion global; panic at startup * macosx/tkMacOSXEvent.c: if MAC_OS_X_VERSION_MIN_REQUIRED constraint * macosx/tkMacOSXInit.c: is not satisfied. * macosx/tkMacOSXInt.h: * macosx/tkMacOSXWm.c: * macosx/tkMacOSXDraw.c (XCopyArea, XCopyPlane, TkPutImage) (TkMacOSXSetupDrawingContext): factor out common code and standardize setup/restore of port, context and clipping; formatting cleanup. * macosx/tkMacOSXWindowEvent.c: add error checking. * macosx/tkMacOSXMenu.c: fix gcc3 warning. * macosx/tkMacOSXScrlbr.c: fix testsuite crash. * macosx/tkMacOSXSubwindows.c: formatting cleanup. * macosx/tkMacOSXRegion.c: fix typos. * macosx/tkMacOSXScale.c: * macosx/tkMacOSXXStubs.c (Tk_GetUserInactiveTime): remove superfluous CFRetain/CFRelease. * macosx/Wish-Release.xcconfig: disable tktest release build stripping. * macosx/Wish.xcodeproj/project.pbxproj: add new Tclsh-Info.plist.in.
Diffstat (limited to 'macosx/tkMacOSXWm.c')
-rw-r--r--macosx/tkMacOSXWm.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index 96d423a..0f5abf3 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -13,7 +13,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXWm.c,v 1.53 2007/06/06 09:55:52 das Exp $
+ * RCS: @(#) $Id: tkMacOSXWm.c,v 1.54 2007/06/09 17:09:41 das Exp $
*/
#include "tkMacOSXInt.h"
@@ -815,7 +815,7 @@ static int WmSetAttribute(
alias);
DisposeHandle((Handle) alias);
}
- ) TK_ENDIF_MAC_OS_X
+ ) TK_ENDIF
}
} else {
int len;
@@ -870,7 +870,7 @@ static int WmSetAttribute(
ChkErr(HIWindowChangeFeatures, macWindow, 0,
kWindowIsOpaque);
}
- ) TK_ENDIF_MAC_OS_X
+ ) TK_ENDIF
} else {
wmPtr->flags &= ~WM_TRANSPARENT;
wmPtr->attributes &= ~kWindowNoShadowAttribute;
@@ -940,7 +940,7 @@ static Tcl_Obj *WmGetAttribute(
err = ChkErr(FSResolveAlias, NULL, alias, &ref,
&wasChanged);
}
- ) TK_ENDIF_MAC_OS_X
+ ) TK_ENDIF
if (err == noErr) {
err = ChkErr(FSRefMakePath, &ref, path, PATH_MAX);
}
@@ -5837,7 +5837,7 @@ ApplyWindowClassAttributeChanges(
if (wmPtr->macClass != oldClass) {
TK_IF_MAC_OS_X_API (4, HIWindowChangeClass,
ChkErr(HIWindowChangeClass, macWindow, wmPtr->macClass);
- ) TK_ENDIF_MAC_OS_X
+ ) TK_ENDIF
ChkErr(GetWindowClass, macWindow, &(wmPtr->macClass));
}
if (newAttributes != oldAttributes) {
@@ -6061,12 +6061,12 @@ TkMacOSXEnterExitFullscreen(
static SystemUIOptions fullscreenOptions = 0;
if (!fullscreenMode) {
- TK_IF_MAC_OS_X_HI_TOOLBOX (3,
+ TK_IF_HI_TOOLBOX (3,
fullscreenMode = kUIModeAllSuppressed;
- ) TK_ELSE_MAC_OS_X (3,
+ ) TK_ELSE_HI_TOOLBOX (3,
fullscreenMode = kUIModeAllHidden;
fullscreenOptions = kUIOptionAutoShowMenuBar;
- ) TK_ENDIF_MAC_OS_X
+ ) TK_ENDIF
}
if (mode != fullscreenMode) {
ChkErr(SetSystemUIMode, fullscreenMode, fullscreenOptions);