diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | macosx/tkMacOSXDraw.c | 9 | ||||
| -rw-r--r-- | macosx/tkMacOSXEvent.h | 4 | ||||
| -rw-r--r-- | macosx/tkMacOSXFont.h | 5 | ||||
| -rw-r--r-- | macosx/tkMacOSXMenu.c | 3 | ||||
| -rw-r--r-- | macosx/tkMacOSXNotify.c | 4 |
6 files changed, 20 insertions, 13 deletions
@@ -1,3 +1,11 @@ +2006-03-28 Daniel Steffen <das@users.sourceforge.net> + + * macosx/tkMacOSXDraw.c: sync whitespace & minor changes + * macosx/tkMacOSXEvent.h: with core-8-4-branch. + * macosx/tkMacOSXFont.h: + * macosx/tkMacOSXMenu.c: + * macosx/tkMacOSXNotify.c: + 2006-03-27 Don Porter <dgp@users.sourceforge.net> *** 8.5a4 TAGGED FOR RELEASE *** diff --git a/macosx/tkMacOSXDraw.c b/macosx/tkMacOSXDraw.c index 0e38e90..51dc8cb 100644 --- a/macosx/tkMacOSXDraw.c +++ b/macosx/tkMacOSXDraw.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: tkMacOSXDraw.c,v 1.12 2006/03/25 06:08:16 das Exp $ + * RCS: @(#) $Id: tkMacOSXDraw.c,v 1.13 2006/03/28 02:43:24 das Exp $ */ #include "tkMacOSXInt.h" @@ -425,7 +425,7 @@ TkPutImage( if ((image->bytes_per_line % 2) == 1) { char *newPtr, *oldPtr; newData = (char *) ckalloc(image->height * - (image->bytes_per_line + 1)); + (image->bytes_per_line + 1)); newPtr = newData; oldPtr = image->data; for (i = 0; i < image->height; i++) { @@ -439,8 +439,9 @@ TkPutImage( bitmap.baseAddr = newData; bitmap.rowBytes = image->bytes_per_line + 1; } else { - newData = (char *) ckalloc(image->height * image->bytes_per_line); - for (i = 0; i < image->height * image->bytes_per_line; i++) { + size_t size = image->height * image->bytes_per_line; + newData = (char *) ckalloc((int) size); + for (i = 0; i < size; i++) { newData[i] = InvertByte((unsigned char) image->data[i]); } bitmap.baseAddr = newData; diff --git a/macosx/tkMacOSXEvent.h b/macosx/tkMacOSXEvent.h index 4b78ca3..8219a36 100644 --- a/macosx/tkMacOSXEvent.h +++ b/macosx/tkMacOSXEvent.h @@ -50,7 +50,7 @@ * software in accordance with the terms specified in this * license. * - * RCS: @(#) $Id: tkMacOSXEvent.h,v 1.8 2006/03/24 14:58:01 das Exp $ + * RCS: @(#) $Id: tkMacOSXEvent.h,v 1.9 2006/03/28 02:43:24 das Exp $ */ #ifndef _TKMACEVENT @@ -60,8 +60,6 @@ #include "tk.h" #endif -#include <Carbon/Carbon.h> - typedef struct { int stopProcessing; int err; diff --git a/macosx/tkMacOSXFont.h b/macosx/tkMacOSXFont.h index ae9f5f4..9856722 100644 --- a/macosx/tkMacOSXFont.h +++ b/macosx/tkMacOSXFont.h @@ -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: tkMacOSXFont.h,v 1.2 2006/03/24 14:58:01 das Exp $ + * RCS: @(#) $Id: tkMacOSXFont.h,v 1.3 2006/03/28 02:43:24 das Exp $ */ #ifndef TKMACOSXFONT_H @@ -102,7 +102,7 @@ MODULE_SCOPE void TkMacOSXLayoutSetString(const TkMacOSXFont * fontPtr, const UniChar * uchars, int ulen); MODULE_SCOPE void TkMacOSXInitControlFontStyle(Tk_Font tkfont, ControlFontStylePtr fsPtr); - + #if TK_MAC_USE_QUARZ MODULE_SCOPE void TkMacOSXQuarzStartDraw( TkMacOSXFontDrawingContext * contextPtr); @@ -112,4 +112,3 @@ MODULE_SCOPE void TkMacOSXQuarzEndDraw( #endif /*TKMACOSXFONT_H*/ - diff --git a/macosx/tkMacOSXMenu.c b/macosx/tkMacOSXMenu.c index 35f63a7..6eb384e 100644 --- a/macosx/tkMacOSXMenu.c +++ b/macosx/tkMacOSXMenu.c @@ -9,13 +9,14 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXMenu.c,v 1.26 2006/03/24 14:58:01 das Exp $ + * RCS: @(#) $Id: tkMacOSXMenu.c,v 1.27 2006/03/28 02:43:24 das Exp $ */ #include "tkMacOSXInt.h" #include "tkMenubutton.h" #include "tkMenu.h" #include "tkColor.h" +#include "tkMacOSXDebug.h" #define USE_TK_MDEF //#define USE_ATSU diff --git a/macosx/tkMacOSXNotify.c b/macosx/tkMacOSXNotify.c index 10bcdcd..94ecb5d 100644 --- a/macosx/tkMacOSXNotify.c +++ b/macosx/tkMacOSXNotify.c @@ -12,10 +12,10 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXNotify.c,v 1.15 2005/12/08 07:50:14 das Exp $ + * RCS: @(#) $Id: tkMacOSXNotify.c,v 1.16 2006/03/28 02:43:24 das Exp $ */ -#include "tkInt.h" +#include "tkMacOSXInt.h" #include "tkMacOSXEvent.h" #include <pthread.h> |