diff options
| author | hobbs <hobbs@noemail.net> | 2002-12-08 00:46:51 (GMT) |
|---|---|---|
| committer | hobbs <hobbs@noemail.net> | 2002-12-08 00:46:51 (GMT) |
| commit | 4662e82c9adf79ab761f7b67d3378fba1eec04a2 (patch) | |
| tree | 0980b63dd1bf1aabca841a318efcd6eaf6102981 /generic | |
| parent | cb66c30ad8c020fa4cef7847ba2a277d58a20aaa (diff) | |
| download | tk-4662e82c9adf79ab761f7b67d3378fba1eec04a2.zip tk-4662e82c9adf79ab761f7b67d3378fba1eec04a2.tar.gz tk-4662e82c9adf79ab761f7b67d3378fba1eec04a2.tar.bz2 | |
* generic/tkInt.decls: add TkWinSetHINSTANCE decl
* generic/tkIntPlatDecls.h: regen
* generic/tkStubInit.c: regen
* win/tkWinInit.c (TkpInit): While init and cleanup aren't correct
* win/tkWinX.c (TkWinXInit): in DllMain, we had to specify the
* win/tkWin32Dll.c (DllMain): true HINSTANCE or the resources of a
dynamic Tk weren't being loaded correctly. Created a new function
TkWinSetHINSTANCE for this purpose.
FossilOrigin-Name: 07dfcd13bcbf8c38b20c8e156f51d25ace1d615d
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkInt.decls | 8 | ||||
| -rw-r--r-- | generic/tkIntPlatDecls.h | 9 | ||||
| -rw-r--r-- | generic/tkStubInit.c | 3 |
3 files changed, 17 insertions, 3 deletions
diff --git a/generic/tkInt.decls b/generic/tkInt.decls index 0a51233..1b105ae 100644 --- a/generic/tkInt.decls +++ b/generic/tkInt.decls @@ -9,7 +9,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: tkInt.decls,v 1.31 2002/10/09 11:56:28 das Exp $ +# RCS: @(#) $Id: tkInt.decls,v 1.32 2002/12/08 00:46:51 hobbs Exp $ library tk @@ -873,6 +873,12 @@ declare 33 win { int TkWinGetPlatformId(void) } +# new for 8.4.1 + +declare 34 win { + void TkWinSetHINSTANCE (HINSTANCE hInstance) +} + ######################## # Mac specific functions diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h index 8b54b75..6719448 100644 --- a/generic/tkIntPlatDecls.h +++ b/generic/tkIntPlatDecls.h @@ -9,7 +9,7 @@ * Copyright (c) 1998-1999 by Scriptics Corporation. * All rights reserved. * - * RCS: @(#) $Id: tkIntPlatDecls.h,v 1.14 2002/08/31 06:12:20 das Exp $ + * RCS: @(#) $Id: tkIntPlatDecls.h,v 1.15 2002/12/08 00:46:51 hobbs Exp $ */ #ifndef _TKINTPLATDECLS @@ -121,6 +121,8 @@ EXTERN Tcl_Obj * TkWinGetMenuSystemDefault _ANSI_ARGS_(( CONST char * className)); /* 33 */ EXTERN int TkWinGetPlatformId _ANSI_ARGS_((void)); +/* 34 */ +EXTERN void TkWinSetHINSTANCE _ANSI_ARGS_((HINSTANCE hInstance)); #endif /* __WIN32__ */ #ifdef MAC_TCL /* 0 */ @@ -459,6 +461,7 @@ typedef struct TkIntPlatStubs { void (*tkWinDialogDebug) _ANSI_ARGS_((int debug)); /* 31 */ Tcl_Obj * (*tkWinGetMenuSystemDefault) _ANSI_ARGS_((Tk_Window tkwin, CONST char * dbName, CONST char * className)); /* 32 */ int (*tkWinGetPlatformId) _ANSI_ARGS_((void)); /* 33 */ + void (*tkWinSetHINSTANCE) _ANSI_ARGS_((HINSTANCE hInstance)); /* 34 */ #endif /* __WIN32__ */ #ifdef MAC_TCL void (*tkGenerateActivateEvents) _ANSI_ARGS_((TkWindow * winPtr, int active)); /* 0 */ @@ -750,6 +753,10 @@ extern TkIntPlatStubs *tkIntPlatStubsPtr; #define TkWinGetPlatformId \ (tkIntPlatStubsPtr->tkWinGetPlatformId) /* 33 */ #endif +#ifndef TkWinSetHINSTANCE +#define TkWinSetHINSTANCE \ + (tkIntPlatStubsPtr->tkWinSetHINSTANCE) /* 34 */ +#endif #endif /* __WIN32__ */ #ifdef MAC_TCL #ifndef TkGenerateActivateEvents diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c index a8e5981..e2bc17a 100644 --- a/generic/tkStubInit.c +++ b/generic/tkStubInit.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkStubInit.c,v 1.39 2002/10/09 11:57:09 das Exp $ + * RCS: @(#) $Id: tkStubInit.c,v 1.40 2002/12/08 00:46:51 hobbs Exp $ */ #include "tkInt.h" @@ -368,6 +368,7 @@ TkIntPlatStubs tkIntPlatStubs = { TkWinDialogDebug, /* 31 */ TkWinGetMenuSystemDefault, /* 32 */ TkWinGetPlatformId, /* 33 */ + TkWinSetHINSTANCE, /* 34 */ #endif /* __WIN32__ */ #ifdef MAC_TCL TkGenerateActivateEvents, /* 0 */ |