1999-12-05 16:10:59 +00:00
|
|
|
--- c++tk/c++tk.cc.orig Thu Sep 25 03:43:24 1997
|
2000-04-29 21:41:20 +00:00
|
|
|
+++ c++tk/c++tk.cc Sat Apr 29 23:40:59 2000
|
1999-11-29 03:49:06 +00:00
|
|
|
@@ -28,6 +28,9 @@
|
|
|
|
|
// $Id: c++tk.cc,v 1.22 1997/05/19 04:06:12 jmz Exp $
|
|
|
|
|
//
|
|
|
|
|
#include <tcl.h>
|
|
|
|
|
+#ifdef TIX
|
|
|
|
|
+#include <tix.h>
|
|
|
|
|
+#endif
|
|
|
|
|
#include <string.h>
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <limits.h>
|
|
|
|
|
@@ -38,7 +41,9 @@
|
|
|
|
|
|
|
|
|
|
extern "C" {
|
|
|
|
|
int Tk_Init (Tcl_Interp *);
|
2000-04-29 21:41:20 +00:00
|
|
|
- ClientData Tk_MainWindow (Tcl_Interp *);
|
|
|
|
|
+#ifdef TIX
|
|
|
|
|
+ int Tixsam_Init (Tcl_Interp *);
|
1999-11-29 03:49:06 +00:00
|
|
|
+#endif
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#include "c++tk.h"
|
|
|
|
|
@@ -80,7 +85,7 @@
|
|
|
|
|
add_tvar (v)
|
|
|
|
|
#define VARIABLE \
|
|
|
|
|
sprintf (xstr, "%s%x", VARNAME, v);\
|
|
|
|
|
- Tcl_SetVar (interp, xstr, *v? "1":"0", TCL_GLOBAL_ONLY);\
|
|
|
|
|
+ Tcl_SetVar (interp, xstr, *v? (char *)"1":(char*)"0", TCL_GLOBAL_ONLY);\
|
|
|
|
|
sprintf (xstr, "%s configure -variable %s%x", pname, VARNAME, v);\
|
|
|
|
|
TkError = Tcl_GlobalEval (interp, xstr);\
|
|
|
|
|
sprintf (xstr, "%s%x", VARNAME, v);\
|
2000-04-29 21:41:20 +00:00
|
|
|
@@ -270,7 +275,6 @@
|
1999-11-29 03:49:06 +00:00
|
|
|
}
|
1999-12-05 16:10:59 +00:00
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
-
|
|
|
|
|
static void
|
|
|
|
|
initialize ()
|
|
|
|
|
{
|
2000-04-29 21:41:20 +00:00
|
|
|
@@ -302,7 +306,7 @@
|
|
|
|
|
#endif
|
|
|
|
|
Tcl_CreateCommand (interp, JMPNAME,
|
|
|
|
|
(Tcl_CmdProc *) Proc_Handler,
|
|
|
|
|
- Tk_MainWindow (interp), 0);
|
|
|
|
|
+ (void *)Tk_MainWindow (interp), 0);
|
|
|
|
|
i_vars = new int * [VAR_SIZE];
|
|
|
|
|
I_vars = new int [VAR_SIZE];
|
|
|
|
|
t_vars = new char * [VAR_SIZE];
|
