diff options
| author | patthoyts <patthoyts@users.sourceforge.net> | 2005-10-14 11:59:18 (GMT) |
|---|---|---|
| committer | patthoyts <patthoyts@users.sourceforge.net> | 2005-10-14 11:59:18 (GMT) |
| commit | 4965c1256fe8406ebdd86e53579132a60cb3bae1 (patch) | |
| tree | a34814fa07b70ca017efa5a439984599e6c1f12b | |
| parent | 850489f8ece9f474335ab0372ca7ef7e0f4633bc (diff) | |
| download | tk-4965c1256fe8406ebdd86e53579132a60cb3bae1.zip tk-4965c1256fe8406ebdd86e53579132a60cb3bae1.tar.gz tk-4965c1256fe8406ebdd86e53579132a60cb3bae1.tar.bz2 | |
* win/tkWinSend.c: Avoid using tcl internal headers and fix to
* win/tkWinSendCom.h: correctly link on all types of build (was
* win/tkWinSendCom.c: broken in static,msvcrt builds).
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | win/tkWinSend.c | 11 | ||||
| -rw-r--r-- | win/tkWinSendCom.c | 8 | ||||
| -rw-r--r-- | win/tkWinSendCom.h | 12 |
4 files changed, 20 insertions, 17 deletions
@@ -1,3 +1,9 @@ +2005-10-14 Pat Thoyts <patthoyts@users.sourceforge.net> + + * win/tkWinSend.c: Avoid using tcl internal headers and fix to + * win/tkWinSendCom.h: correctly link on all types of build (was + * win/tkWinSendCom.c: broken in static,msvcrt builds). + 2005-10-12 Donal K. Fellows <donal.k.fellows@man.ac.uk> * tests/canvPs.test, tests/canvPsBmap.tcl, tests/canvPsImg.tcl: diff --git a/win/tkWinSend.c b/win/tkWinSend.c index cb6523c..51d947e 100644 --- a/win/tkWinSend.c +++ b/win/tkWinSend.c @@ -11,12 +11,9 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWinSend.c,v 1.9 2005/09/30 16:07:21 dgp Exp $ + * RCS: @(#) $Id: tkWinSend.c,v 1.10 2005/10/14 11:59:19 patthoyts Exp $ */ -#include "tkPort.h" -#include "tkInt.h" -#include "tclInt.h" /* TCL_TSD_INIT */ #include "tkWinSendCom.h" /* Should be defined in WTypes.h but mingw 1.0 is missing them */ @@ -113,13 +110,12 @@ Tk_SetAppName(tkwin, name) * "send" commands. Must be globally * unique. */ { - ThreadSpecificData *tsdPtr; + ThreadSpecificData *tsdPtr = NULL; TkWindow *winPtr = (TkWindow *)tkwin; RegisteredInterp *riPtr = NULL; Tcl_Interp *interp; HRESULT hr = S_OK; - tsdPtr = TCL_TSD_INIT(&dataKey); interp = winPtr->mainPtr->interp; /* @@ -127,6 +123,9 @@ Tk_SetAppName(tkwin, name) */ return name; + tsdPtr = (ThreadSpecificData *) + Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); + /* * Initialise the COM library for this interpreter just once. */ diff --git a/win/tkWinSendCom.c b/win/tkWinSendCom.c index 9ad1f15..28dc960 100644 --- a/win/tkWinSendCom.c +++ b/win/tkWinSendCom.c @@ -17,17 +17,11 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWinSendCom.c,v 1.4 2004/01/15 21:46:22 davygrvy Exp $ + * RCS: @(#) $Id: tkWinSendCom.c,v 1.5 2005/10/14 11:59:19 patthoyts Exp $ */ #include "tkWinSendCom.h" -#ifdef _MSC_VER -# pragma comment (lib, "ole32.lib") -# pragma comment (lib, "oleaut32.lib") -# pragma comment (lib, "uuid.lib") -#endif - /* * ---------------------------------------------------------------------- * Non-public prototypes. diff --git a/win/tkWinSendCom.h b/win/tkWinSendCom.h index fd98ca2..2344431 100644 --- a/win/tkWinSendCom.h +++ b/win/tkWinSendCom.h @@ -10,17 +10,21 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWinSendCom.h,v 1.1 2003/09/26 23:59:26 patthoyts Exp $ + * RCS: @(#) $Id: tkWinSendCom.h,v 1.2 2005/10/14 11:59:19 patthoyts Exp $ */ #ifndef _tkWinSendCom_h_INCLUDE #define _tkWinSendCom_h_INCLUDE -#include "tkPort.h" -#include "tkInt.h" - +#include "tkWinInt.h" #include <ole2.h> +#ifdef _MSC_VER +# pragma comment (lib, "ole32.lib") +# pragma comment (lib, "oleaut32.lib") +# pragma comment (lib, "uuid.lib") +#endif + /* * TkWinSendCom CoClass structure */ |