X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMPRWidget2.cxx;h=a4d48213f71bc5927c1131904384588743f370f7;hb=80b04dc9e3b981e24fe9ae0d81cdeb8af6e6f8c1;hp=89b0f9e8744e8df1da42c9f061a531ff3126085d;hpb=a4ee3758aa0477f677fb981e2c4d6e29995e8db8;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget2.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget2.cxx index 89b0f9e..a4d4821 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget2.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget2.cxx @@ -1,3 +1,28 @@ +/*# --------------------------------------------------------------------- +# +# 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. +# ------------------------------------------------------------------------ */ + #include "wxMPRWidget2.h" #include "marImageData.h" @@ -5,8 +30,8 @@ //---------------------------------------------------------------------------- //---------------------------------------------------------------------------- //---------------------------------------------------------------------------- -wxMPRWidget2::wxMPRWidget2(wxWindow* parent,marImageData *marimagedata,double voxelSize) -: wxMPRWidget(parent,marimagedata,voxelSize) +wxMPRWidget2::wxMPRWidget2(wxWindow* parent,marImageData *marimagedata) +: wxMPRWidget(parent,marimagedata) { } //---------------------------------------------------------------------------- @@ -17,5 +42,11 @@ wxMPRWidget2::~wxMPRWidget2() void wxMPRWidget2::OnRefreshView(wxCommandEvent & event) // Virtual { wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121); // Refresh +//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0 +#if wxMAJOR_VERSION <= 2 this->GetParent()->ProcessEvent(newevent1); +#else + this->GetParent()->ProcessWindowEvent(newevent1); +#endif + }