diff options
| author | das <das> | 2005-05-14 20:53:31 (GMT) |
|---|---|---|
| committer | das <das> | 2005-05-14 20:53:31 (GMT) |
| commit | 6ad2c1d5f066bc0b9a361380e8ed87201fd8ca4a (patch) | |
| tree | 00b7ac832dfb7876972240ccb8ec825b0796b567 /macosx/tkMacOSXXStubs.c | |
| parent | 9309ab3779c2b72ae26817c003adadbb4140a79b (diff) | |
| download | tk-6ad2c1d5f066bc0b9a361380e8ed87201fd8ca4a.zip tk-6ad2c1d5f066bc0b9a361380e8ed87201fd8ca4a.tar.gz tk-6ad2c1d5f066bc0b9a361380e8ed87201fd8ca4a.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/tkMacOSXXStubs.c')
| -rw-r--r-- | macosx/tkMacOSXXStubs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/macosx/tkMacOSXXStubs.c b/macosx/tkMacOSXXStubs.c index 5e913d1..aca8651 100644 --- a/macosx/tkMacOSXXStubs.c +++ b/macosx/tkMacOSXXStubs.c @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXXStubs.c,v 1.2.2.4 2004/11/13 03:42:10 das Exp $ + * RCS: @(#) $Id: tkMacOSXXStubs.c,v 1.2.2.5 2005/05/14 20:53:31 das Exp $ */ #include "tkInt.h" @@ -365,7 +365,7 @@ XGetImage(display, d, x, y, width, height, plane_mask, format) int format; { XImage * imagePtr = NULL; - Pixmap pixmap = NULL; + Pixmap pixmap = (Pixmap) NULL; Tk_Window win = (Tk_Window) ((MacDrawable *) d)->winPtr; GC gc; int depth = 32; |