diff options
| author | das <das> | 2008-03-27 12:03:59 (GMT) |
|---|---|---|
| committer | das <das> | 2008-03-27 12:03:59 (GMT) |
| commit | 3e67fd8a57bea98ff9c3c11bad0c4170b3cd7b81 (patch) | |
| tree | 5d43556f8b34ac59313642ff2c8c9e878856256e /generic | |
| parent | 911acda58ac5c35f412afa95e613441c4341e795 (diff) | |
| download | tk-3e67fd8a57bea98ff9c3c11bad0c4170b3cd7b81.zip tk-3e67fd8a57bea98ff9c3c11bad0c4170b3cd7b81.tar.gz tk-3e67fd8a57bea98ff9c3c11bad0c4170b3cd7b81.tar.bz2 | |
* generic/ttk/ttkStubLib.c: ensure tcl stubs are used in libtkstub
even in a static build of Tk.
* generic/ttk/ttkDecls.h: fix incorrect number of arguments in
Ttk_InitStubs macro definition.
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/ttk/ttkDecls.h | 4 | ||||
| -rw-r--r-- | generic/ttk/ttkStubLib.c | 14 |
2 files changed, 14 insertions, 4 deletions
diff --git a/generic/ttk/ttkDecls.h b/generic/ttk/ttkDecls.h index 3ed681b..6e515d6 100644 --- a/generic/ttk/ttkDecls.h +++ b/generic/ttk/ttkDecls.h @@ -1,5 +1,5 @@ /* - * $Id: ttkDecls.h,v 1.5 2007/12/13 15:26:26 dgp Exp $ + * $Id: ttkDecls.h,v 1.6 2008/03/27 12:04:02 das Exp $ * * This file is (mostly) automatically generated from ttk.decls. */ @@ -15,7 +15,7 @@ extern const char *TtkInitializeStubs( interp, TTK_VERSION, TTK_STUBS_EPOCH, TTK_STUBS_REVISION) #else -#define Ttk_InitStubs(interp) Tcl_PkgRequire(interp,"Ttk",TTK_VERSION) +#define Ttk_InitStubs(interp) Tcl_PkgRequire(interp, "Ttk", TTK_VERSION, 0) #endif diff --git a/generic/ttk/ttkStubLib.c b/generic/ttk/ttkStubLib.c index 11b1698..15d4d28 100644 --- a/generic/ttk/ttkStubLib.c +++ b/generic/ttk/ttkStubLib.c @@ -1,15 +1,25 @@ /* - * $Id: ttkStubLib.c,v 1.4 2008/03/21 21:49:12 jenglish Exp $ + * $Id: ttkStubLib.c,v 1.5 2008/03/27 12:04:02 das Exp $ * SOURCE: tk/generic/tkStubLib.c, version 1.9 2004/03/17 */ +/* + * We need to ensure that we use the tcl stub macros so that this file + * contains no references to any of the tcl stub functions. + */ + +#ifndef USE_TCL_STUBS +#define USE_TCL_STUBS +#endif +#undef USE_TCL_STUB_PROCS + #include "tk.h" #define USE_TTK_STUBS 1 #include "ttkTheme.h" MODULE_SCOPE const TtkStubs *ttkStubsPtr; -const TtkStubs *ttkStubsPtr; +const TtkStubs *ttkStubsPtr = NULL; /* *---------------------------------------------------------------------- |