diff options
| author | das <das> | 2005-05-14 20:53:31 (GMT) |
|---|---|---|
| committer | das <das> | 2005-05-14 20:53:31 (GMT) |
| commit | 96723e49a59aebc9468bb4f297062273172cfe34 (patch) | |
| tree | 00b7ac832dfb7876972240ccb8ec825b0796b567 /macosx/tkMacOSXKeyboard.c | |
| parent | 00a8d27d5712be73ac8277e02ec7c273c2bce91c (diff) | |
| download | tk-96723e49a59aebc9468bb4f297062273172cfe34.zip tk-96723e49a59aebc9468bb4f297062273172cfe34.tar.gz tk-96723e49a59aebc9468bb4f297062273172cfe34.tar.bz2 | |
* macosx/tkMacOSXInit.c:
* macosx/tkMacOSXNotify.c: introduction of new tcl notifier based on
CFRunLoop allows replacement of the custom TkAqua notifier by a
standard tcl event source. Removes requirement of threaded tcl core
for TkAqua, allows to stub-link TkAqua against Tcl by removing use of
the unstubbed TclInitNotifier & TclFinalizeNotifier. [Tcl Patch 1202052]
* macosx/Wish.pbproj/project.pbxproj: stub-link TkAqua: build with
USE_TCL_STUBS and link against libtclstub instead of Tcl.framework,
unexport libtclstub symbols from Tk to avoid duplicate symbol warnings
when linking with both Tcl and Tk, fixes for gcc4.0 warnings.
* macosx/tkMacOSXBitmap.c:
* macosx/tkMacOSXButton.c:
* macosx/tkMacOSXDialog.c:
* macosx/tkMacOSXFont.c:
* macosx/tkMacOSXHLEvents.c:
* macosx/tkMacOSXInit.c:
* macosx/tkMacOSXKeyboard.c:
* macosx/tkMacOSXMenu.c:
* macosx/tkMacOSXMenubutton.c:
* macosx/tkMacOSXWm.c:
* macosx/tkMacOSXXStubs.c: fixed gcc 4.0 warnings.
* unix/tcl.m4: sync with tcl
* unix/configure: autoconf-2.13
Diffstat (limited to 'macosx/tkMacOSXKeyboard.c')
| -rw-r--r-- | macosx/tkMacOSXKeyboard.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/macosx/tkMacOSXKeyboard.c b/macosx/tkMacOSXKeyboard.c index 597f3cf..5312127 100644 --- a/macosx/tkMacOSXKeyboard.c +++ b/macosx/tkMacOSXKeyboard.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXKeyboard.c,v 1.5.2.3 2004/02/25 13:29:41 cc_benny Exp $ + * RCS: @(#) $Id: tkMacOSXKeyboard.c,v 1.5.2.4 2005/05/14 20:53:31 das Exp $ */ #include "tkInt.h" @@ -30,6 +30,7 @@ #define LATIN1_MAX 255 #define MAC_KEYCODE_MAX 0x7F #define MAC_KEYCODE_MASK 0x7F +#undef ALT_MASK #define ALT_MASK Mod1Mask #define OPTION_MASK Mod2Mask |