#3131 creaImageIO Feature New Normal - branch changeWx28to30 compilation with wxWid...

[creaImageIO.git] / src / creaImageIOWxGimmickTools.cpp

diff --git a/src/creaImageIOWxGimmickTools.cpp b/src/creaImageIOWxGimmickTools.cpp
index 809c46de38fcf557195ed9b34f139796f2d29c72..b14ad6637e3f0558dfc380d312ebac21fb9171c1 100644 (file)
--- a/src/creaImageIOWxGimmickTools.cpp
+++ b/src/creaImageIOWxGimmickTools.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 <creaImageIOWxGimmickTools.h>
 
 
@@ -28,11 +56,22 @@ namespace creaImageIO
                Connect( _addCheckBox->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &WxGimmickTools::onAddToDatabase );
                Connect( _mhdCheckBox->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &WxGimmickTools::onMHD );
                
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
                wxFlexGridSizer *textSizer = new wxFlexGridSizer(1,2);
+#else
+               wxFlexGridSizer *textSizer = new wxFlexGridSizer(2);
+#endif
+
                textSizer->Add( new wxStaticText(this, -1, _T("Transform a Bruker 'Serie'/'Study'/'set of Studies' directory into Dicom / MHD format.")), 1, wxGROW );
                textSizer->Add( new wxStaticText(this, -1, _T("If checkbox is selected images will be loaded into the DB.")), 1, wxGROW );
 
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
                wxFlexGridSizer *sizer  = new wxFlexGridSizer(2,5);
+#else
+               wxFlexGridSizer *sizer  = new wxFlexGridSizer(5);
+#endif
                sizer->Add( new wxStaticText(this, -1, _T(" ")), 1, wxGROW );
                sizer->Add( new wxStaticText(this, -1, _T(" ")), 1, wxGROW );
                sizer->Add( _inputPath,   1, wxGROW );
@@ -44,7 +83,12 @@ namespace creaImageIO
                sizer->Add( _addCheckBox, 1, wxGROW );
                sizer->Add( _mhdCheckBox, 1, wxGROW );
                
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
                wxFlexGridSizer *topSizer = new wxFlexGridSizer(1, 2);
+#else
+               wxFlexGridSizer *topSizer = new wxFlexGridSizer(2);
+#endif
                topSizer->Add( textSizer, 1, wxGROW );
                topSizer->Add( sizer,     1, wxGROW );
                this->SetSizer( topSizer );