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/tkMacOSXBitmap.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/tkMacOSXBitmap.c')
| -rw-r--r-- | macosx/tkMacOSXBitmap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/macosx/tkMacOSXBitmap.c b/macosx/tkMacOSXBitmap.c index 9f930aa..186368c 100644 --- a/macosx/tkMacOSXBitmap.c +++ b/macosx/tkMacOSXBitmap.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: tkMacOSXBitmap.c,v 1.2 2002/08/31 06:12:29 das Exp $ + * RCS: @(#) $Id: tkMacOSXBitmap.c,v 1.2.2.1 2005/05/14 20:53:31 das Exp $ */ #include "tkPort.h" @@ -240,7 +240,7 @@ TkpGetNativeAppBitmap( } if (resource == NULL) { - return NULL; + return (Pixmap) NULL; } pix = Tk_GetPixmap(display, None, 32, 32, 0); |