From ed5c9a8ff7e78b0749d0f7c103c5584f72e3ed95 Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Fri, 5 Nov 2021 08:08:48 +0100 Subject: [PATCH] #3389 Stuck Render macOS --- src/creawxVTKRenderWindowInteractor.mm | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/src/creawxVTKRenderWindowInteractor.mm b/src/creawxVTKRenderWindowInteractor.mm index 4f63d14..0c74b5a 100644 --- a/src/creawxVTKRenderWindowInteractor.mm +++ b/src/creawxVTKRenderWindowInteractor.mm @@ -439,7 +439,6 @@ void wxVTKRenderWindowInteractor::Start() //--------------------------------------------------------------------------- void wxVTKRenderWindowInteractor::UpdateSize(int x, int y) { -//printf("EED wxVTKRenderWindowInteractor::UpdateSize Start\n"); if( RenderWindow ) { // if the size changed tell render window @@ -463,7 +462,6 @@ void wxVTKRenderWindowInteractor::UpdateSize(int x, int y) #endif //__WXMSW__ } // if x y } // if RenderWindow -printf("EED wxVTKRenderWindowInteractor::UpdateSize End\n"); } //--------------------------------------------------------------------------- int wxVTKRenderWindowInteractor::CreateTimer(int WXUNUSED(timertype)) @@ -567,8 +565,6 @@ long wxVTKRenderWindowInteractor::GetHandleHack() //--------------------------------------------------------------------------- void wxVTKRenderWindowInteractor::OnPaint(wxPaintEvent& WXUNUSED(event)) { -printf("EED wxVTKRenderWindowInteractor::OnPaint Start\n"); - //must always be here //EED2021-08-26 #ifdef __WXCOCOA__ @@ -634,7 +630,6 @@ printf("EED wxVTKRenderWindowInteractor::OnPaint Start\n"); #endif #endif -printf("EED wxVTKRenderWindowInteractor::OnPaint End\n"); } //--------------------------------------------------------------------------- void wxVTKRenderWindowInteractor::OnEraseBackground(wxEraseEvent &event) @@ -721,7 +716,7 @@ void wxVTKRenderWindowInteractor::OnLeave(wxMouseEvent &event) //--------------------------------------------------------------------------- void wxVTKRenderWindowInteractor::OnKeyDown(wxKeyEvent &event) { - if (!Enabled) + if (!Enabled) { return; } @@ -751,7 +746,6 @@ void wxVTKRenderWindowInteractor::OnKeyDown(wxKeyEvent &event) //--------------------------------------------------------------------------- void wxVTKRenderWindowInteractor::OnKeyUp(wxKeyEvent &event) { -printf("EED wxVTKRenderWindowInteractor::OnKeyUp Start\n"); if (!Enabled) { return; @@ -778,14 +772,12 @@ printf("EED wxVTKRenderWindowInteractor::OnKeyUp Start\n"); event.GetKeyCode(), 1); #endif event.Skip(); -printf("EED wxVTKRenderWindowInteractor::OnKeyUp End\n"); } #endif //!(VTK_MAJOR_VERSION == 3 && VTK_MINOR_VERSION == 1) //--------------------------------------------------------------------------- void wxVTKRenderWindowInteractor::OnChar(wxKeyEvent &event) { -printf("EED wxVTKRenderWindowInteractor::OnKeyUp Start\n"); - if (!Enabled) + if (!Enabled) { return; } @@ -808,12 +800,10 @@ printf("EED wxVTKRenderWindowInteractor::OnKeyUp Start\n"); InvokeEvent(vtkCommand::CharEvent, NULL); #endif event.Skip(); -printf("EED wxVTKRenderWindowInteractor::OnKeyUp End\n"); } //--------------------------------------------------------------------------- void wxVTKRenderWindowInteractor::OnButtonDown(wxMouseEvent &event) { -printf("EED wxVTKRenderWindowInteractor::OnButtonDown Start\n"); if (!Enabled || (ActiveButton != wxEVT_NULL)) { return; @@ -872,12 +862,10 @@ printf("EED wxVTKRenderWindowInteractor::OnButtonDown Start\n"); { CaptureMouse(); } -printf("EED wxVTKRenderWindowInteractor::OnButtonDown End\n"); } //--------------------------------------------------------------------------- void wxVTKRenderWindowInteractor::OnButtonUp(wxMouseEvent &event) { -printf("EED wxVTKRenderWindowInteractor::OnButtonDown Start\n"); //EVT_xxx_DOWN == EVT_xxx_UP - 1 //This is only needed if two mouse buttons are pressed at the same time. //In wxWindows 2.4 and later: better use of wxMOUSE_BTN_RIGHT or @@ -934,12 +922,10 @@ printf("EED wxVTKRenderWindowInteractor::OnButtonDown Start\n"); ReleaseMouse(); } ActiveButton = wxEVT_NULL; -printf("EED wxVTKRenderWindowInteractor::OnButtonDown End\n"); } //--------------------------------------------------------------------------- void wxVTKRenderWindowInteractor::OnMouseWheel(wxMouseEvent& event) { -printf("EED wxVTKRenderWindowInteractor::OnMouseWheel Start\n"); // Mouse wheel was only added after VTK 4.4 (I think...) #if VTK_MAJOR_VERSION > 4 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 4) // new style @@ -958,7 +944,6 @@ printf("EED wxVTKRenderWindowInteractor::OnMouseWheel Start\n"); InvokeEvent(vtkCommand::MouseWheelBackwardEvent, NULL); } #endif - printf("EED wxVTKRenderWindowInteractor::OnMouseWheel End\n"); } @@ -982,7 +967,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 @@ -1023,7 +1007,6 @@ printf("EED wxVTKRenderWindowInteractor::Render Start\n"); } #endif } // if renderAllowed -printf("EED wxVTKRenderWindowInteractor::Render Start\n"); } //--------------------------------------------------------------------------- void wxVTKRenderWindowInteractor::SetRenderWhenDisabled(int newValue) -- 2.47.1