diff options
Diffstat (limited to 'generic')
-rw-r--r-- | generic/tkMain.c | 11 | ||||
-rw-r--r-- | generic/tkRectOval.c | 9 |
2 files changed, 18 insertions, 2 deletions
diff --git a/generic/tkMain.c b/generic/tkMain.c index d723218..a225b70 100644 --- a/generic/tkMain.c +++ b/generic/tkMain.c @@ -13,7 +13,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMain.c,v 1.17 2004/03/17 18:15:43 das Exp $ + * RCS: @(#) $Id: tkMain.c,v 1.18 2004/11/11 01:24:31 das Exp $ */ #include <ctype.h> @@ -31,6 +31,9 @@ #ifdef __WIN32__ #include "tkWinInt.h" #endif +#ifdef MAC_OSX_TK +#include "tkMacOSXInt.h" +#endif typedef struct ThreadSpecificData { @@ -125,6 +128,12 @@ Tk_MainEx(argc, argv, appInitProc, interp) #if defined(__WIN32__) Tk_InitConsoleChannels(interp); #endif + +#ifdef MAC_OSX_TK + if (Tcl_GetStartupScript(NULL) == NULL) { + TkMacOSXDefaultStartupScript(); + } +#endif #ifdef TCL_MEM_DEBUG Tcl_InitMemory(interp); diff --git a/generic/tkRectOval.c b/generic/tkRectOval.c index 454b9a5..8d13a60 100644 --- a/generic/tkRectOval.c +++ b/generic/tkRectOval.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkRectOval.c,v 1.11 2004/01/13 02:06:00 davygrvy Exp $ + * RCS: @(#) $Id: tkRectOval.c,v 1.12 2004/11/11 01:24:32 das Exp $ */ #include <stdio.h> @@ -672,7 +672,14 @@ ComputeRectOvalBbox(canvas, rectOvalPtr) bloat = 0; #endif } else { +#ifdef MAC_OSX_TK + /* Mac OS X CoreGraphics needs correct rounding here + * otherwise it will draw outside the bounding box. + * Probably correct on other platforms as well? */ + bloat = (int) (width+1.5)/2; +#else bloat = (int) (width+1)/2; +#endif } /* |