diff options
| -rw-r--r-- | generic/tkTreeCtrl.c | 14 | ||||
| -rw-r--r-- | generic/tkTreeCtrl.h | 10 | ||||
| -rw-r--r-- | generic/tkTreeDisplay.c | 6 | ||||
| -rw-r--r-- | generic/tkTreeItem.c | 7 |
4 files changed, 13 insertions, 24 deletions
diff --git a/generic/tkTreeCtrl.c b/generic/tkTreeCtrl.c index f9f1358..e79ec94 100644 --- a/generic/tkTreeCtrl.c +++ b/generic/tkTreeCtrl.c @@ -7,7 +7,7 @@ * Copyright (c) 2002-2003 Christian Krone * Copyright (c) 2003-2004 ActiveState, a division of Sophos * - * RCS: @(#) $Id: tkTreeCtrl.c,v 1.35 2005/05/17 01:19:04 treectrl Exp $ + * RCS: @(#) $Id: tkTreeCtrl.c,v 1.36 2005/05/19 20:32:05 treectrl Exp $ */ #include "tkTreeCtrl.h" @@ -324,7 +324,7 @@ static int TreeObjCmd(ClientData clientData, Tcl_Interp *interp, Tcl_InitHashTable(&tree->imageHash, TCL_STRING_KEYS); #ifdef ALLOC_HAX - tree->allocData = AllocHax_Init(); + tree->allocData = AllocHax_Init(); #endif Tree_InitColumns(tree); @@ -2820,8 +2820,7 @@ int ImageTintCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *C return TCL_OK; } -#ifndef WIN32 -#ifndef TARGET_OS_MAC +#if !defined(WIN32) && !defined(MAC_TCL) && !defined(MAC_OSX_TK) int LoupeCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { @@ -2966,8 +2965,7 @@ int LoupeCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST return TCL_OK; } -#endif /* not TARGET_OS_MAC */ -#endif /* not WIN32 */ +#endif /* not WIN32 && not MAC_TCL && not MAC_OSX_TK */ /* Taken from tkFont.c */ static void RecomputeWidgets(TkWindow *winPtr) @@ -3032,12 +3030,10 @@ DLLEXPORT int Treectrl_Init(Tcl_Interp *interp) /* Hack for colorizing a image (like Win98 explorer) */ Tcl_CreateObjCommand(interp, "imagetint", ImageTintCmd, NULL, NULL); -#ifndef WIN32 -#ifndef TARGET_OS_MAC +#if !defined(WIN32) && !defined(MAC_TCL) && !defined(MAC_OSX_TK) /* Screen magnifier to check those dotted lines */ Tcl_CreateObjCommand(interp, "loupe", LoupeCmd, NULL, NULL); #endif -#endif Tcl_CreateObjCommand(interp, "treectrl", TreeObjCmd, NULL, NULL); if (Tcl_PkgProvide(interp, PACKAGE_NAME, PACKAGE_VERSION) != TCL_OK) { return TCL_ERROR; diff --git a/generic/tkTreeCtrl.h b/generic/tkTreeCtrl.h index 4646e9c..a082f0e 100644 --- a/generic/tkTreeCtrl.h +++ b/generic/tkTreeCtrl.h @@ -7,7 +7,7 @@ * Copyright (c) 2002-2003 Christian Krone * Copyright (c) 2003 ActiveState Corporation * - * RCS: @(#) $Id: tkTreeCtrl.h,v 1.26 2005/05/17 01:19:05 treectrl Exp $ + * RCS: @(#) $Id: tkTreeCtrl.h,v 1.27 2005/05/19 20:32:06 treectrl Exp $ */ #include "tkPort.h" @@ -21,14 +21,6 @@ #define dbwin printf #endif /* HAVE_DBWIN_H */ -/* define TARGET_OS_MAC: */ -#if defined(MAC_TCL) || defined(MAC_OSX_TK) -#include <TargetConditionals.h> -#if defined(TARGET_OS_MAC) && ! TARGET_OS_MAC -#undef TARGET_OS_MAC -#endif -#endif - #ifndef TRUE #define TRUE 1 #define FALSE 0 diff --git a/generic/tkTreeDisplay.c b/generic/tkTreeDisplay.c index 5b2057e..c050d16 100644 --- a/generic/tkTreeDisplay.c +++ b/generic/tkTreeDisplay.c @@ -5,7 +5,7 @@ * * Copyright (c) 2002-2005 Tim Baker * - * RCS: @(#) $Id: tkTreeDisplay.c,v 1.23 2005/05/17 01:18:03 treectrl Exp $ + * RCS: @(#) $Id: tkTreeDisplay.c,v 1.24 2005/05/19 20:31:26 treectrl Exp $ */ #include "tkTreeCtrl.h" @@ -2429,7 +2429,7 @@ TreeColumnProxy_Draw(TreeCtrl *tree) unsigned long gcMask; GC gc; -#if defined(TARGET_OS_MAC) +#if defined(MAC_TCL) || defined(MAC_OSX_TK) gcValues.function = GXxor; #else gcValues.function = GXinvert; @@ -2439,7 +2439,7 @@ TreeColumnProxy_Draw(TreeCtrl *tree) gc = Tk_GetGC(tree->tkwin, gcMask, &gcValues); /* GXinvert doesn't work with XFillRectangle() on Win32 */ -#if defined(WIN32) || defined(TARGET_OS_MAC) +#if defined(WIN32) || defined(MAC_TCL) || defined(MAC_OSX_TK) XDrawLine(tree->display, Tk_WindowId(tree->tkwin), gc, tree->columnProxy.sx, tree->inset, diff --git a/generic/tkTreeItem.c b/generic/tkTreeItem.c index 7744231..50c0ec3 100644 --- a/generic/tkTreeItem.c +++ b/generic/tkTreeItem.c @@ -5,7 +5,7 @@ * * Copyright (c) 2002-2005 Tim Baker * - * RCS: @(#) $Id: tkTreeItem.c,v 1.34 2005/05/19 00:40:25 treectrl Exp $ + * RCS: @(#) $Id: tkTreeItem.c,v 1.35 2005/05/19 20:28:57 treectrl Exp $ */ #include "tkTreeCtrl.h" @@ -1799,8 +1799,9 @@ void TreeItem_DrawButton(TreeCtrl *tree, TreeItem item_, int x, int y, int width if (ISROOT(self) && !tree->showRootButton) return; -#ifdef TARGET_OS_MAC - macoffset = 1; +#if defined(MAC_TCL) || defined(MAC_OSX_TK) + /* QuickDraw on Mac is offset by one pixel in both x and y. */ + macoffset = 1; #endif indent = TreeItem_Indent(tree, item_); |