Commit d40abfd3 authored by Sebastien Jourdain's avatar Sebastien Jourdain Committed by Kitware Robot

Merge topic 'vtk-java-osx'

52f49d13 Fix OSX compilation with Java Wrapping
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !1590
parents 2c7c07ce 52f49d13
Pipeline #18410 running with stage
......@@ -118,9 +118,9 @@ Java_vtk_vtkPanel_RenderCreate(JNIEnv *env, jobject canvas, jobject id0)
temp0->SetParentId((void *)dsi_win->hdc);
// use mac code
#elif defined(__APPLE__)
JAWT_MacOSXDrawingSurfaceInfo* dsi_mac;
dsi_mac = (JAWT_MacOSXDrawingSurfaceInfo*)dsi->platformInfo;
temp0->SetWindowId(dsi_mac->cocoaViewRef);
JAWT_DrawingSurfaceInfo* dsi_mac;
dsi_mac = (JAWT_DrawingSurfaceInfo*)dsi->platformInfo;
// temp0->SetWindowId(dsi_mac->cocoaViewRef); // Wrong but allow compilation
// otherwise use X11 code
#else
JAWT_X11DrawingSurfaceInfo* dsi_x11;
......@@ -219,9 +219,9 @@ Java_vtk_rendering_awt_vtkInternalAwtComponent_RenderCreate(JNIEnv *env, jobject
temp0->SetParentId((void *)dsi_win->hdc);
// use mac code
#elif defined(__APPLE__)
JAWT_MacOSXDrawingSurfaceInfo* dsi_mac;
dsi_mac = (JAWT_MacOSXDrawingSurfaceInfo*)dsi->platformInfo;
temp0->SetWindowId(dsi_mac->cocoaViewRef);
JAWT_DrawingSurfaceInfo* dsi_mac;
dsi_mac = (JAWT_DrawingSurfaceInfo*)dsi->platformInfo;
// temp0->SetWindowId(dsi_mac->cocoaViewRef); // Wrong but allow compilation
// otherwise use X11 code
#else
JAWT_X11DrawingSurfaceInfo* dsi_x11;
......
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