summaryrefslogtreecommitdiffstats
path: root/generic/ttk/ttkStubLib.c
diff options
context:
space:
mode:
authordas <das>2008-03-27 12:03:59 (GMT)
committerdas <das>2008-03-27 12:03:59 (GMT)
commit3e67fd8a57bea98ff9c3c11bad0c4170b3cd7b81 (patch)
tree5d43556f8b34ac59313642ff2c8c9e878856256e /generic/ttk/ttkStubLib.c
parent911acda58ac5c35f412afa95e613441c4341e795 (diff)
downloadtk-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/ttk/ttkStubLib.c')
-rw-r--r--generic/ttk/ttkStubLib.c14
1 files changed, 12 insertions, 2 deletions
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;
/*
*----------------------------------------------------------------------