summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornijtmans <nijtmans>2010-09-23 21:45:14 (GMT)
committernijtmans <nijtmans>2010-09-23 21:45:14 (GMT)
commit1b31f97ffbb009c3449903ede524bc241c6bade9 (patch)
treea55f95904cd0125c711995b380f85d26126e174f
parent1c475f1af34445bb15b76cf17cb7a3fbe7648d81 (diff)
downloadtk-1b31f97ffbb009c3449903ede524bc241c6bade9.zip
tk-1b31f97ffbb009c3449903ede524bc241c6bade9.tar.gz
tk-1b31f97ffbb009c3449903ede524bc241c6bade9.tar.bz2
Make Tcl_SetPanicProc and Tcl_GetStringResult callable without stubs, just as Tcl_SetVar.
-rw-r--r--unix/tkAppInit.c4
-rw-r--r--win/winMain.c13
2 files changed, 7 insertions, 10 deletions
diff --git a/unix/tkAppInit.c b/unix/tkAppInit.c
index caab966..e18ddc2 100644
--- a/unix/tkAppInit.c
+++ b/unix/tkAppInit.c
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkAppInit.c,v 1.11 2010/09/23 10:01:57 nijtmans Exp $
+ * RCS: @(#) $Id: tkAppInit.c,v 1.12 2010/09/23 21:45:14 nijtmans Exp $
*/
#include "tk.h"
@@ -94,7 +94,7 @@ int
Tcl_AppInit(
Tcl_Interp *interp) /* Interpreter for application. */
{
- if (Tcl_Init(interp) == TCL_ERROR) {
+ if ((Tcl_Init)(interp) == TCL_ERROR) {
return TCL_ERROR;
}
diff --git a/win/winMain.c b/win/winMain.c
index b29d355..5abaeb3 100644
--- a/win/winMain.c
+++ b/win/winMain.c
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: winMain.c,v 1.32 2010/09/23 20:59:00 nijtmans Exp $
+ * RCS: @(#) $Id: winMain.c,v 1.33 2010/09/23 21:45:14 nijtmans Exp $
*/
/* TODO: This file does not compile in UNICODE mode.
@@ -20,9 +20,6 @@
#undef UNICODE
#undef _UNICODE
-/* Make sure this file is never compiled with Stubs! */
-#undef USE_TCL_STUBS
-#undef USE_TK_STUBS
#include "tk.h"
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
@@ -95,7 +92,7 @@ _tWinMain(
int argc;
TCHAR *p;
- Tcl_SetPanicProc(WishPanic);
+ (Tcl_SetPanicProc)(WishPanic);
/*
* Create the console channels and install them as the standard channels.
@@ -164,7 +161,7 @@ int
Tcl_AppInit(
Tcl_Interp *interp) /* Interpreter for application. */
{
- if (Tcl_Init(interp) == TCL_ERROR) {
+ if ((Tcl_Init)(interp) == TCL_ERROR) {
goto error;
}
if (Tk_Init(interp) == TCL_ERROR) {
@@ -236,7 +233,7 @@ Tcl_AppInit(
error:
MessageBeep(MB_ICONEXCLAMATION);
- MessageBoxA(NULL, Tcl_GetStringResult(interp), "Error in Wish",
+ MessageBoxA(NULL, (Tcl_GetStringResult)(interp), "Error in Wish",
MB_ICONSTOP | MB_OK | MB_TASKMODAL | MB_SETFOREGROUND);
ExitProcess(1);
@@ -305,7 +302,7 @@ _tmain(
int argc,
TCHAR **argv)
{
- Tcl_SetPanicProc(WishPanic);
+ (Tcl_SetPanicProc)(WishPanic);
/*
* Set up the default locale to be standard "C" locale so parsing is