Attachment #145580 for bug #212700

View | Details | Raw Unified | Return to bug 212700
Collapse All | Expand All

Lines 23-33 Link Here

(-)VTK/Common/vtkTclUtil.cxx (-4 lines)
23		23
24	extern "C"	24	extern "C"
25	{	25	{
26	#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4 && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
27	typedef int (vtkTclCommandType)(ClientData, Tcl_Interp ,int, CONST84 char *[]);	26	typedef int (vtkTclCommandType)(ClientData, Tcl_Interp ,int, CONST84 char *[]);
28	#else
29	typedef int (vtkTclCommandType)(ClientData, Tcl_Interp ,int, char *[]);
30	#endif
31	}	27	}
32		28
33	vtkTclInterpStruct vtkGetInterpStruct(Tcl_Interp interp)	29	vtkTclInterpStruct vtkGetInterpStruct(Tcl_Interp interp)




                         self->TkWin, 
                         vtkTkImageViewerWidgetConfigSpecs,
                         argc, 
#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)// && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
                         const_cast<CONST84 char **>(argv), 
#else
                         argv, 

  int vtkTkImageViewerWidget_Widget(ClientData clientData, 
                                    Tcl_Interp *interp,
                                    int argc, 
#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)// && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
                                    CONST84
#endif
                                    char *argv[]) 

        result = vtkTkImageViewerWidget_Configure(interp, 
                                                  self, 
                                                  argc-2, 
#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)// && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
                                                  const_cast<char **>(argv+2), 
#else
                                                  argv+2, 

  int vtkTkImageViewerWidget_Cmd(ClientData clientData, 
                                 Tcl_Interp *interp, 
                                 int argc, 
#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)// && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
    CONST84
#endif
    char *name;

    if (vtkTkImageViewerWidget_Configure(interp, 
                                         self, 
                                         argc-2, 
#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)// && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
                                         const_cast<char **>(argv+2), 
#else
                                         argv+2, 




  int vtkImageDataToTkPhoto_Cmd (ClientData vtkNotUsed(clientData), 
                                 Tcl_Interp *interp, 
                                 int argc, 
#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)// && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
                                 CONST84
#endif
                                 char **argv)

                         self->TkWin, 
                         vtkTkRenderWidgetConfigSpecs,
                         argc, 
#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)// && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
                         const_cast<CONST84 char **>(argv), 
#else
                         argv, 

  int vtkTkRenderWidget_Widget(ClientData clientData, 
                               Tcl_Interp *interp,
                               int argc, 
#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)// && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
                               CONST84
#endif
                               char *argv[]) 

        {
        /* Execute a configuration change */
        result = vtkTkRenderWidget_Configure(interp, self, argc-2, 
#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)// && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
                                             const_cast<char **>(argv+2), 
#else
                                             argv+2, 

  int vtkTkRenderWidget_Cmd(ClientData clientData, 
                            Tcl_Interp *interp, 
                            int argc, 
#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)// && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
    CONST84
#endif
    char *name;

    if (vtkTkRenderWidget_Configure(interp, 
                                    self, 
                                    argc-2, 
#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)// && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
                                    const_cast<char **>(argv+2), 
#else
                                    argv+2, 

Lines 49-55 Link Here

(-)VTK/Wrapping/vtkWrapTclInit.c (-1 / +1 lines)
49	fprintf(fout,	49	fprintf(fout,
50	"extern \"C\"\n"	50	"extern \"C\"\n"
51	"{\n"	51	"{\n"
52	"#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4) && (TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)\n"	52	"#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)// && (TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)\n"
53	" typedef int (vtkTclCommandType)(ClientData, Tcl_Interp ,int, CONST84 char *[]);\n"	53	" typedef int (vtkTclCommandType)(ClientData, Tcl_Interp ,int, CONST84 char *[]);\n"
54	"#else\n"	54	"#else\n"
55	" typedef int (vtkTclCommandType)(ClientData, Tcl_Interp ,int, char *[]);\n"	55	" typedef int (vtkTclCommandType)(ClientData, Tcl_Interp ,int, char *[]);\n"

Return to bug 212700

Lines 91-97 Link Here

(-)VTK/Rendering/vtkTkImageViewerWidget.cxx (-6 / +6 lines)
91	self->TkWin,	91	self->TkWin,
92	vtkTkImageViewerWidgetConfigSpecs,	92	vtkTkImageViewerWidgetConfigSpecs,
93	argc,	93	argc,
94	#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4 && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)	94	#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)// && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
95	const_cast<CONST84 char **>(argv),	95	const_cast<CONST84 char **>(argv),
96	#else	96	#else
97	argv,	97	argv,
Lines 123-129 Link Here
123	int vtkTkImageViewerWidget_Widget(ClientData clientData,	123	int vtkTkImageViewerWidget_Widget(ClientData clientData,
124	Tcl_Interp *interp,	124	Tcl_Interp *interp,
125	int argc,	125	int argc,
126	#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4 && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)	126	#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)// && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
127	CONST84	127	CONST84
128	#endif	128	#endif
129	char *argv[])	129	char *argv[])
Lines 178-184 Link Here
178	result = vtkTkImageViewerWidget_Configure(interp,	178	result = vtkTkImageViewerWidget_Configure(interp,
179	self,	179	self,
180	argc-2,	180	argc-2,
181	#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4 && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)	181	#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)// && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
182	const_cast<char **>(argv+2),	182	const_cast<char **>(argv+2),
183	#else	183	#else
184	argv+2,	184	argv+2,
Lines 224-235 Link Here
224	int vtkTkImageViewerWidget_Cmd(ClientData clientData,	224	int vtkTkImageViewerWidget_Cmd(ClientData clientData,
225	Tcl_Interp *interp,	225	Tcl_Interp *interp,
226	int argc,	226	int argc,
227	#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4 && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)	227	#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)// && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
228	CONST84	228	CONST84
229	#endif	229	#endif
230	char **argv)	230	char **argv)
231	{	231	{
232	#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4 && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)	232	#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)// && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
233	CONST84	233	CONST84
234	#endif	234	#endif
235	char *name;	235	char *name;
Lines 281-287 Link Here
281	if (vtkTkImageViewerWidget_Configure(interp,	281	if (vtkTkImageViewerWidget_Configure(interp,
282	self,	282	self,
283	argc-2,	283	argc-2,
284	#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4 && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)	284	#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)// && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
285	const_cast<char **>(argv+2),	285	const_cast<char **>(argv+2),
286	#else	286	#else
287	argv+2,	287	argv+2,

Lines 128-134 Link Here

(-)VTK/Rendering/vtkTkRenderWidget.cxx (-7 / +7 lines)
128	int vtkImageDataToTkPhoto_Cmd (ClientData vtkNotUsed(clientData),	128	int vtkImageDataToTkPhoto_Cmd (ClientData vtkNotUsed(clientData),
129	Tcl_Interp *interp,	129	Tcl_Interp *interp,
130	int argc,	130	int argc,
131	#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4 && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)	131	#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)// && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
132	CONST84	132	CONST84
133	#endif	133	#endif
134	char **argv)	134	char **argv)
Lines 361-367 Link Here
361	self->TkWin,	361	self->TkWin,
362	vtkTkRenderWidgetConfigSpecs,	362	vtkTkRenderWidgetConfigSpecs,
363	argc,	363	argc,
364	#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4 && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)	364	#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)// && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
365	const_cast<CONST84 char **>(argv),	365	const_cast<CONST84 char **>(argv),
366	#else	366	#else
367	argv,	367	argv,
Lines 393-399 Link Here
393	int vtkTkRenderWidget_Widget(ClientData clientData,	393	int vtkTkRenderWidget_Widget(ClientData clientData,
394	Tcl_Interp *interp,	394	Tcl_Interp *interp,
395	int argc,	395	int argc,
396	#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4 && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)	396	#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)// && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
397	CONST84	397	CONST84
398	#endif	398	#endif
399	char *argv[])	399	char *argv[])
Lines 444-450 Link Here
444	{	444	{
445	/* Execute a configuration change */	445	/* Execute a configuration change */
446	result = vtkTkRenderWidget_Configure(interp, self, argc-2,	446	result = vtkTkRenderWidget_Configure(interp, self, argc-2,
447	#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4 && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)	447	#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)// && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
448	const_cast<char **>(argv+2),	448	const_cast<char **>(argv+2),
449	#else	449	#else
450	argv+2,	450	argv+2,
Lines 490-501 Link Here
490	int vtkTkRenderWidget_Cmd(ClientData clientData,	490	int vtkTkRenderWidget_Cmd(ClientData clientData,
491	Tcl_Interp *interp,	491	Tcl_Interp *interp,
492	int argc,	492	int argc,
493	#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4 && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)	493	#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)// && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
494	CONST84	494	CONST84
495	#endif	495	#endif
496	char **argv)	496	char **argv)
497	{	497	{
498	#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4 && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)	498	#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)// && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
499	CONST84	499	CONST84
500	#endif	500	#endif
501	char *name;	501	char *name;
Lines 545-551 Link Here
545	if (vtkTkRenderWidget_Configure(interp,	545	if (vtkTkRenderWidget_Configure(interp,
546	self,	546	self,
547	argc-2,	547	argc-2,
548	#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4 && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)	548	#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)// && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
549	const_cast<char **>(argv+2),	549	const_cast<char **>(argv+2),
550	#else	550	#else
551	argv+2,	551	argv+2,