diff options
| author | das <das> | 2005-05-14 20:53:31 (GMT) |
|---|---|---|
| committer | das <das> | 2005-05-14 20:53:31 (GMT) |
| commit | 7bf8bff521c800c8ec8c6dc966524a725365a6c5 (patch) | |
| tree | 00b7ac832dfb7876972240ccb8ec825b0796b567 /macosx/tkMacOSXFont.c | |
| parent | 4faf796e581a2574152f5df5b89c35afa807f84a (diff) | |
| download | tk-7bf8bff521c800c8ec8c6dc966524a725365a6c5.zip tk-7bf8bff521c800c8ec8c6dc966524a725365a6c5.tar.gz tk-7bf8bff521c800c8ec8c6dc966524a725365a6c5.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/tkMacOSXFont.c')
| -rw-r--r-- | macosx/tkMacOSXFont.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/macosx/tkMacOSXFont.c b/macosx/tkMacOSXFont.c index ae3a6cc..50a51b1 100644 --- a/macosx/tkMacOSXFont.c +++ b/macosx/tkMacOSXFont.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXFont.c,v 1.3.2.2 2004/11/12 09:03:40 das Exp $ + * RCS: @(#) $Id: tkMacOSXFont.c,v 1.3.2.3 2005/05/14 20:53:31 das Exp $ */ #include <Carbon/Carbon.h> @@ -87,7 +87,7 @@ static TkStateMap scriptMap[] = { {smEastEurRoman, "macCentEuro"}, {smVietnamese, "macVietnam"}, {smExtArabic, "macSindhi"}, - {NULL, NULL} + {0, NULL} }; static TkStateMap romanMap[] = { @@ -97,13 +97,13 @@ static TkStateMap romanMap[] = { {langRomanian, "macRomania"}, {langTurkish, "macTurkish"}, {langGreek, "macGreek"}, - {NULL, NULL} + {0, NULL} }; static TkStateMap cyrillicMap[] = { {langUkrainian, "macUkraine"}, {langBulgarian, "macBulgaria"}, - {NULL, NULL} + {0, NULL} }; /* |