summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authordas <das>2004-11-11 01:24:29 (GMT)
committerdas <das>2004-11-11 01:24:29 (GMT)
commitfa61ec1dd665487c5513d7db7255a2e09ed3e3e1 (patch)
treec22d22b2f3ad690eeadd7c8e57c9cf5b9eb56b0d /generic
parentb7be4e0e9de6b6cb325269f53ce18596d73b4426 (diff)
downloadtk-fa61ec1dd665487c5513d7db7255a2e09ed3e3e1.zip
tk-fa61ec1dd665487c5513d7db7255a2e09ed3e3e1.tar.gz
tk-fa61ec1dd665487c5513d7db7255a2e09ed3e3e1.tar.bz2
* generic/tkMain.c:
* macosx/tkMacOSXAppInit.c (removed): * macosx/Wish.pbproj/project.pbxproj: * macosx/tkMacOSXInit.c: * macosx/tkMacOSXInt.h: changes to make TkAqua dynamically loadable, enabling [package require Tk] from tclsh. Startup code from tkMacOSXAppInit.c moved into tkMacOSXInit.c, added code that notifies the window server that an unbundled executable is a full GUI application after loading Tk. [Patch 1035348] * doc/wm.n: documented [wm attributes] on Mac OS X. [Bug 606665] * macosx/tkMacOSXWm.c: implemented TIP 222 [wm attributes -alpha] on Mac OS X. [Patch 892194] WmIconbitmapCmd: adopted FSRef changes from [wm atttrs -titlepath]. * macosx/tkMacOSXSubwindows.c: synced spacing/formatting with core-8-4-branch. * generic/tkRectOval.c: * macosx/README: * macosx/tkMacOSXDefault.h: * macosx/tkMacOSXDraw.c: * macosx/tkMacOSXInit.c: * macosx/tkMacOSXInt.h: * macosx/tkMacOSXMenu.c: * macosx/tkMacOSXWm.c: forward port from core-8-4-branch of Jim's and my changes for CG drawing and [wm attributes] (corresponds to 8.4 changes dating from 09-18, 07-27, 07-24). * macosx/tkMacOSXMouseEvent.c: endianness fixes. * macosx/Wish.pbproj/project.pbxproj: corrected path to html help inside framework. * macosx/Makefile: prevent parallel make from building several targets at the same time.
Diffstat (limited to 'generic')
-rw-r--r--generic/tkMain.c11
-rw-r--r--generic/tkRectOval.c9
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
}
/*