Commit 9da8d6a3 authored by Andy Cedilnik's avatar Andy Cedilnik
Browse files

ENH: Cleanups and some cocoa work

parent 48e17aa0
......@@ -358,8 +358,7 @@ SET(KIT_TCL_DEPS)
SET(KIT_PYTHON_DEPS)
SET(KIT_JAVA_DEPS)
IF(NOT VTK_USE_OFFSCREEN)
IF (TK_LIBRARY)
IF (TK_LIBRARY AND VTK_USE_TK)
SET (HAVE_LIMITS_H ${CMAKE_HAVE_LIMITS_H})
SET (HAVE_UNISTD_H ${CMAKE_HAVE_UNISTD_H})
CONFIGURE_FILE(
......@@ -370,19 +369,14 @@ IF (TK_LIBRARY)
FILES ${CMAKE_CURRENT_BINARY_DIR}/vtkTkInternals.h)
ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
ENDIF (TK_LIBRARY)
ENDIF(NOT VTK_USE_OFFSCREEN)
ENDIF (TK_LIBRARY AND VTK_USE_TK)
IF (VTK_WRAP_TCL)
IF(NOT VTK_USE_COCOA)
IF(NOT VTK_USE_OFFSCREEN)
SET(KitTCL_SRCS
vtkTkRenderWidget.cxx
vtkTkImageViewerWidget.cxx)
ENDIF(NOT VTK_USE_OFFSCREEN)
ENDIF(NOT VTK_USE_COCOA)
IF (VTK_USE_TK)
IF(VTK_USE_TK)
SET(KitTCL_SRCS
vtkTkRenderWidget.cxx
vtkTkImageViewerWidget.cxx)
# Use special interactor for X and Tk.
IF(VTK_USE_X)
SET(KitTCL_SRCS ${KitTCL_SRCS}
......
......@@ -2,6 +2,7 @@
#
if {[ info commands wm ] != ""} {
if {[ info commands toplevel ] != ""} {
catch {unset vtkInteract.bold}
catch {unset vtkInteract.normal}
......@@ -100,6 +101,5 @@ proc vtkInteract {} {
wm withdraw .vtkInteract
}
vtkInteract
} else {
puts "Cannot use Interactor since TK does not exists"
}
}
Supports Markdown
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