X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreawxVTKRenderWindowInteractor.cxx;h=ab565eed6bf64ca4b4435615db9b2d537585dff8;hb=9e7201b8488e634387f2ca91821f9964bbddc2ca;hp=61fe2302b15066f77d7f137beeb1002769734d0a;hpb=fa9a448de6690f29627216055d16fe1503d46f54;p=crea.git diff --git a/src/creawxVTKRenderWindowInteractor.cxx b/src/creawxVTKRenderWindowInteractor.cxx index 61fe230..ab565ee 100644 --- a/src/creawxVTKRenderWindowInteractor.cxx +++ b/src/creawxVTKRenderWindowInteractor.cxx @@ -43,7 +43,6 @@ =========================================================================*/ -#import #include @@ -64,7 +63,8 @@ // AKT: wxOSX 2.9.x defines __WXOSX_COCOA__ rather than __WXCOCOA__ #ifdef __WXOSX_COCOA__ -#define __WXCOCOA__ + #import + #define __WXCOCOA__ #endif #if defined(__WXMAC__) && wxCHECK_VERSION(2,9,0) @@ -464,7 +464,6 @@ void wxVTKRenderWindowInteractor::OnTimer(wxTimerEvent& WXUNUSED(event)) // in wxPython/src/helpers.cpp long wxVTKRenderWindowInteractor::GetHandleHack() { -printf("EED wxVTKRenderWindowInteractor::GetHandleHack start \n"); //helper function to hide the MSW vs GTK stuff long handle_tmp = 0; @@ -490,8 +489,6 @@ printf("EED wxVTKRenderWindowInteractor::GetHandleHack start \n"); // Find and return the actual X-Window. #if defined(__WXGTK__) || defined(__WXX11__) -printf("EED wxVTKRenderWindowInteractor::GetHandleHack End AAA handle_tmp %ld \n", handle_tmp); -printf("EED wxVTKRenderWindowInteractor::GetHandleHack End AAA handle_tmp %ld \n", (long)GetXWindow(this)); return (long)GetXWindow(this); #endif @@ -499,7 +496,6 @@ printf("EED wxVTKRenderWindowInteractor::GetHandleHack End AAA handle_tmp %ld \ // handle_tmp = (long)this->GetXWindow(); //#endif -printf("EED wxVTKRenderWindowInteractor::GetHandleHack End BBB handle_tmp %d \n", handle_tmp); return handle_tmp; } //--------------------------------------------------------------------------- @@ -904,7 +900,6 @@ void wxVTKRenderWindowInteractor::OnMouseCaptureLost(wxMouseCaptureLostEvent& ev //--------------------------------------------------------------------------- void wxVTKRenderWindowInteractor::Render() { -printf("EED wxVTKRenderWindowInteractor::Render Start \n"); #if wxCHECK_VERSION(2, 8, 0) int renderAllowed = !IsFrozen(); #else @@ -930,9 +925,7 @@ printf("EED wxVTKRenderWindowInteractor::Render Start \n"); #endif if(Handle && (Handle == GetHandleHack()) ) { -printf("EED wxVTKRenderWindowInteractor::Render 1 \n"); RenderWindow->Render(); -printf("EED wxVTKRenderWindowInteractor::Render 2 \n"); } #if VTK_MAJOR_VERSION > 4 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 2) else if(GetHandleHack()) @@ -947,8 +940,6 @@ printf("EED wxVTKRenderWindowInteractor::Render 2 \n"); } #endif -printf("EED wxVTKRenderWindowInteractor::Render End \n"); - } } //---------------------------------------------------------------------------