Merge remote-tracking branch 'origin/changeWx28to30' into vtk7itk4wx3

[creaImageIO.git] / src / creaImageIOWxGimmickTools.cpp

diff --git a/src/creaImageIOWxGimmickTools.cpp b/src/creaImageIOWxGimmickTools.cpp
index 2d06a41d773335c5f672b7772b43ac3d2102b5d4..b14ad6637e3f0558dfc380d312ebac21fb9171c1 100644 (file)
--- 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 );