Commit 0db0363e authored by Mathieu Malaterre's avatar Mathieu Malaterre

BUG: Fix Bug #1026 - VTK and java wrapping on Mac. Thanks to David Clunie for patch.

parent 56fb010c
......@@ -108,7 +108,8 @@ Java_vtk_vtkPanel_RenderCreate(JNIEnv *env, jobject canvas, jobject id0)
#ifdef VTK_USE_CARBON
temp0->SetWindowId((void *)dsi_mac->carbonWindowRef);
#else
temp0->SetWindowId((void *)dsi_mac->cocoaWindowRef);
//temp0->SetWindowId((void *)dsi_mac->cocoaWindowRef);
temp0->SetWindowId((void *)dsi_mac->cocoaViewRef);
#endif
// otherwise use X11 code
#else
......
......@@ -408,6 +408,9 @@ ENDIF (VTK_WRAP_PYTHON)
# source files
#
IF (VTK_WRAP_JAVA)
IF(APPLE)
ADD_DEFINITIONS("-ObjC++")
ENDIF(APPLE)
VTK_WRAP_JAVA2(vtk${KIT}Java KitJava_SRCS ${Kit_SRCS})
ADD_LIBRARY(vtk${KIT}Java SHARED ${KitJava_SRCS} ${Kit_JAVA_EXTRA_SRCS})
TARGET_LINK_LIBRARIES(vtk${KIT}Java vtk${KIT} ${KIT_JAVA_LIBS})
......
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