X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOWxGimmickTools.cpp;fp=src%2FcreaImageIOWxGimmickTools.cpp;h=b14ad6637e3f0558dfc380d312ebac21fb9171c1;hb=26b4c3303c14bfef570ad5671627ba5e01519f83;hp=2d06a41d773335c5f672b7772b43ac3d2102b5d4;hpb=b52bf19755b9e9f7d4a40abb2c8e881b56d49577;p=creaImageIO.git

diff --git a/src/creaImageIOWxGimmickTools.cpp b/src/creaImageIOWxGimmickTools.cpp
index 2d06a41..b14ad66 100644
--- a/src/creaImageIOWxGimmickTools.cpp
+++ b/src/creaImageIOWxGimmickTools.cpp
@@ -56,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 );
@@ -72,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 );