X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreawxVTKRenderWindowInteractor.cxx;h=b83bcce5c6147a0d217b64ef10809de31249c411;hb=c8a0837d54a0c9004e53eb92ff652a8e996a2fad;hp=eeb123ac24518c34b792ddacf7f722fd62a88dbc;hpb=471c69fe690517ba3c5e35e19c998ff45d3be459;p=crea.git diff --git a/src/creawxVTKRenderWindowInteractor.cxx b/src/creawxVTKRenderWindowInteractor.cxx index eeb123a..b83bcce 100644 --- a/src/creawxVTKRenderWindowInteractor.cxx +++ b/src/creawxVTKRenderWindowInteractor.cxx @@ -1,14 +1,37 @@ +/* +# --------------------------------------------------------------------- +# +# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image +# pour la Santé) +# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton +# Previous Authors : Laurent Guigues, Jean-Pierre Roux +# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil +# +# This software is governed by the CeCILL-B license under French law and +# abiding by the rules of distribution of free software. You can use, +# modify and/ or redistribute the software under the terms of the CeCILL-B +# license as circulated by CEA, CNRS and INRIA at the following URL +# http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html +# or in the file LICENSE.txt. +# +# As a counterpart to the access to the source code and rights to copy, +# modify and redistribute granted by the license, users are provided only +# with a limited warranty and the software's author, the holder of the +# economic rights, and the successive licensors have only limited +# liability. +# +# The fact that you are presently reading this means that you have had +# knowledge of the CeCILL-B license and that you accept its terms. +# ------------------------------------------------------------------------ +*/ + /*========================================================================= Program: Visualization Toolkit Module: $RCSfile: creawxVTKRenderWindowInteractor.cxx,v $ Language: C++ - Date: $Date: 2011/07/12 09:38:09 $ - Version: $Revision: 1.8 $ - - Copyright (c) 1993-2002 Ken Martin, Will Schroeder, Bill Lorensen - All rights reserved. - See Copyright.txt or http://www.kitware.com/Copyright.htm for details. + Date: $Date: 2012/11/15 10:43:26 $ + Version: $Revision: 1.11 $ This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR @@ -139,7 +162,7 @@ BEGIN_EVENT_TABLE(creawxVTKRenderWindowInteractor, wxWindow) EVT_SIZE (creawxVTKRenderWindowInteractor::OnSize) END_EVENT_TABLE() -//EED win Compilation why??: vtkCxxRevisionMacro(creawxVTKRenderWindowInteractor, "$Revision: 1.8 $") +//EED win Compilation why??: vtkCxxRevisionMacro(creawxVTKRenderWindowInteractor, "$Revision: 1.11 $") vtkInstantiatorNewMacro(creawxVTKRenderWindowInteractor) //--------------------------------------------------------------------------- @@ -388,7 +411,7 @@ void creawxVTKRenderWindowInteractor::OnPaint(wxPaintEvent& WXUNUSED(event)) rwin->UpdateContext(); } #else - // This solves a problem with repainting after a window resize + // This solves a problem with repainting after a window resize // See also: http://sourceforge.net/mailarchive/forum.php?thread_id=31690967&forum_id=41789 vtkCarbonRenderWindow* rwin = vtkCarbonRenderWindow::SafeDownCast(RenderWindow); if( rwin ) @@ -396,6 +419,7 @@ void creawxVTKRenderWindowInteractor::OnPaint(wxPaintEvent& WXUNUSED(event)) rwin->UpdateGLRegion(); } #endif + #endif } //--------------------------------------------------------------------------- @@ -767,7 +791,7 @@ void creawxVTKRenderWindowInteractor::SetRenderWhenDisabled(int newValue) //resulting in a Render(), resulting in Update() being called whilst //still in progress. - RenderWhenDisabled = (bool)newValue; + RenderWhenDisabled = newValue != 0; } //--------------------------------------------------------------------------- //