Commit 0e957632 authored by Bill Lorensen's avatar Bill Lorensen

ERR: compability problems witj tck alpha/beta relases.

parent 1117331b
......@@ -23,8 +23,8 @@
extern "C"
{
#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)
typedef int (*vtkTclCommandType)(ClientData, Tcl_Interp *,int, CONST char *[]);
#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4 && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
typedef int (*vtkTclCommandType)(ClientData, Tcl_Interp *,int, CONST84 char *[]);
#else
typedef int (*vtkTclCommandType)(ClientData, Tcl_Interp *,int, char *[]);
#endif
......
......@@ -94,7 +94,7 @@ int vtkTkImageViewerWidget_Configure(Tcl_Interp *interp,
self->TkWin,
vtkTkImageViewerWidgetConfigSpecs,
argc,
#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)
#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4 && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
const_cast<const char **>(argv),
#else
argv,
......@@ -126,8 +126,8 @@ extern "C"
int vtkTkImageViewerWidget_Widget(ClientData clientData,
Tcl_Interp *interp,
int argc,
#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)
const
#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4 && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
CONST84
#endif
char *argv[])
{
......@@ -181,7 +181,7 @@ extern "C"
result = vtkTkImageViewerWidget_Configure(interp,
self,
argc-2,
#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)
#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4 && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
const_cast<char **>(argv+2),
#else
argv+2,
......@@ -227,13 +227,13 @@ extern "C"
int vtkTkImageViewerWidget_Cmd(ClientData clientData,
Tcl_Interp *interp,
int argc,
#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)
const
#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4 && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
CONST84
#endif
char **argv)
{
#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)
const
#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4 && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
CONST84
#endif
char *name;
Tk_Window main = (Tk_Window)clientData;
......@@ -284,7 +284,7 @@ extern "C"
if (vtkTkImageViewerWidget_Configure(interp,
self,
argc-2,
#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)
#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4 && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
const_cast<char **>(argv+2),
#else
argv+2,
......
......@@ -131,8 +131,8 @@ extern "C" {
int vtkImageDataToTkPhoto_Cmd (ClientData vtkNotUsed(clientData),
Tcl_Interp *interp,
int argc,
#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)
const
#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4 && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
CONST84
#endif
char **argv)
{
......@@ -362,7 +362,7 @@ int vtkTkRenderWidget_Configure(Tcl_Interp *interp,
self->TkWin,
vtkTkRenderWidgetConfigSpecs,
argc,
#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)
#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4 && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
const_cast<const char **>(argv),
#else
argv,
......@@ -394,8 +394,8 @@ extern "C"
int vtkTkRenderWidget_Widget(ClientData clientData,
Tcl_Interp *interp,
int argc,
#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)
const
#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4 && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
CONST84
#endif
char *argv[])
{
......@@ -445,7 +445,7 @@ extern "C"
{
/* Execute a configuration change */
result = vtkTkRenderWidget_Configure(interp, self, argc-2,
#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)
#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4 && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
const_cast<char **>(argv+2),
#else
argv+2,
......@@ -491,13 +491,13 @@ extern "C"
int vtkTkRenderWidget_Cmd(ClientData clientData,
Tcl_Interp *interp,
int argc,
#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)
const
#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4 && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
CONST84
#endif
char **argv)
{
#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)
const
#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4 && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
CONST84
#endif
char *name;
Tk_Window main = (Tk_Window)clientData;
......@@ -546,7 +546,7 @@ extern "C"
if (vtkTkRenderWidget_Configure(interp,
self,
argc-2,
#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)
#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4 && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
const_cast<char **>(argv+2),
#else
argv+2,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment