Clean code

[creaImageIO.git] / src / creaImageIOWxDescriptorPanel.cpp

diff --git a/src/creaImageIOWxDescriptorPanel.cpp b/src/creaImageIOWxDescriptorPanel.cpp
index d78d1e40b1236f65695b9a1276561dc49bfffe28..9f563b66493cee26f216d0f00ff303d4dbb75781 100644 (file)
--- a/src/creaImageIOWxDescriptorPanel.cpp
+++ b/src/creaImageIOWxDescriptorPanel.cpp
@@ -1,3 +1,31 @@
+/*
+# ---------------------------------------------------------------------
+#
+# 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 "creaImageIOWxDescriptorPanel.h"
 #include <creaImageIOSystem.h>
 #if defined(USE_GDCM)
@@ -81,7 +109,14 @@ namespace creaImageIO
 
        // RESULT
 
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
        ResultCtrl=new wxTextCtrl(this, ID_EL_CTRL,_T(""), wxPoint(5,150), wxSize(250,310), wxTE_READONLY| wxMac | wxTE_MULTILINE | wxTE_RICH );
+#else
+       ResultCtrl=new wxTextCtrl(this, ID_EL_CTRL,_T(""), wxPoint(5,150), wxSize(250,310), wxTE_READONLY| wxTE_MULTILINE | wxTE_RICH );
+#endif
+
+
        wxButton *RemoveCtrl = new wxButton(this, ID_REMOVE_ADD,_T("Remove an entry"), wxPoint(280,200) );
        Connect( RemoveCtrl->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &WxDescriptorPanel::OnRemove ); 
 
@@ -560,7 +595,12 @@ namespace creaImageIO
   //////////////////////////////////////////////////
    void WxDescriptorPanel::OnLoad(wxCommandEvent &Event)
    {
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
            long style = wxOPEN | wxFILE_MUST_EXIST;
+#else
+           long style = wxFD_OPEN | wxFD_FILE_MUST_EXIST;
+#endif
           LevelCtrl->SetValue(_T("patient"));
           ResultCtrl->Clear();
           DscpTree.clear();
@@ -607,7 +647,12 @@ namespace creaImageIO
    const std::string WxDescriptorPanel::saveDescriptor()
    {
           std::string file = "";
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
                long style = wxSAVE;
+#else
+               long style = wxFD_SAVE;
+#endif
                std::string wc("*.dscp");
                wxFileDialog* FD = new wxFileDialog( 0, 
                                                _T("Select file"),