summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--generic/ttk/ttkDecls.h4
-rw-r--r--generic/ttk/ttkStubLib.c14
3 files changed, 21 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 35bfbef..cbe73c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-03-27 Daniel Steffen <das@users.sourceforge.net>
+
+ * 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.
+
2008-03-26 Don Porter <dgp@users.sourceforge.net>
* changes: Updates for 8.5.2 release.
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;
/*
*----------------------------------------------------------------------