From 99911bfc5d1d86fe58eb2d6240be4e89a466dbad Mon Sep 17 00:00:00 2001 From: treectrl Date: Sat, 23 Jul 2005 00:48:47 +0000 Subject: Tcl_PkgRequire same version of treectrl. Fixed ActualProc using ElementText. --- shellicon/shellicon.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/shellicon/shellicon.c b/shellicon/shellicon.c index 0062638..b9c2a7f 100644 --- a/shellicon/shellicon.c +++ b/shellicon/shellicon.c @@ -7,7 +7,7 @@ * * Copyright (c) 2005 Tim Baker * - * RCS: @(#) $Id: shellicon.c,v 1.2 2005/07/12 02:48:12 treectrl Exp $ + * RCS: @(#) $Id: shellicon.c,v 1.3 2005/07/23 00:48:47 treectrl Exp $ */ #include "tkTreeCtrl.h" @@ -60,6 +60,10 @@ TreeCtrlStubs *stubs; stubs->PerStateInfo_Free(t,ty,in) #define PerStateInfo_FromObj(t,pr,ty,in) \ stubs->PerStateInfo_FromObj(t,pr,ty,in) +#define PerStateInfo_ForState(t,ty,in,st,ma) \ + stubs->PerStateInfo_ForState(t,ty,in,st,ma) +#define PerStateInfo_ObjForState(t,ty,in,st,ma) \ + stubs->PerStateInfo_ObjForState(t,ty,in,st,ma) #define PerStateInfo_Undefine(t,ty,in,st) \ stubs->PerStateInfo_Undefine(t,ty,in,st) #define pstBoolean \ @@ -630,8 +634,8 @@ static int UndefProcShellIcon(ElementArgs *args) static int ActualProcShellIcon(ElementArgs *args) { TreeCtrl *tree = args->tree; - ElementText *elemX = (ElementText *) args->elem; - ElementText *masterX = (ElementText *) args->elem->master; + ElementShellIcon *elemX = (ElementShellIcon *) args->elem; + ElementShellIcon *masterX = (ElementShellIcon *) args->elem->master; static CONST char *optionName[] = { "-draw", (char *) NULL }; @@ -720,7 +724,7 @@ DLLEXPORT int Shellicon_Init(Tcl_Interp *interp) #endif /* Load TkTreeCtrl */ - if (Tcl_PkgRequire(interp, "treectrl", "2.0.1", TRUE) == NULL) + if (Tcl_PkgRequire(interp, "treectrl", PACKAGE_PATCHLEVEL, TRUE) == NULL) return TCL_ERROR; /* Get the stubs table from TkTreeCtrl */ -- cgit v0.12