X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualPaint%2FwxManualPaintPanel.cpp;h=57fd497a452561a4a12581e93187cf765dd599f6;hb=25e3adf442d6a8d357d52410267445c54426c525;hp=ab311ae392aaa469c0c690c4ff9dbfe323cd7c26;hpb=86048e9a60b41a8e2dcc1f7554835d16e74f2b2e;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/wxManualPaintPanel.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/wxManualPaintPanel.cpp
index ab311ae..57fd497 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/wxManualPaintPanel.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/wxManualPaintPanel.cpp
@@ -72,7 +72,14 @@ wxManualPaintPanel::wxManualPaintPanel( wxWindow * parent )
 	this->_gConfigSizer->Add( _mBarSlices, 1, wxGROW );
 	//GrayLevel Slider
 	this->_gConfigSizer->Add( _txtGrayLevel );
+
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
 	wxFlexGridSizer *sizerGrayLevel = new wxFlexGridSizer( 2, wxHORIZONTAL );
+#else
+	wxFlexGridSizer *sizerGrayLevel = new wxFlexGridSizer( 2 );
+#endif
+
 	sizerGrayLevel->Add( _sldGrayLevel, 1, wxGROW );
 	sizerGrayLevel->Add( _graylevelCtrl, 1,
 		wxALIGN_BOTTOM | wxALIGN_LEFT | wxALL, 5 );
@@ -87,7 +94,14 @@ wxManualPaintPanel::wxManualPaintPanel( wxWindow * parent )
 		new wxStaticText( this, -1, _T("Brush Settings") ) );
 	//BrushSize Slider
 	this->_brushSizer->Add( _txtBrushSize );
+
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
 	wxFlexGridSizer *sizersdlBrushSize = new wxFlexGridSizer( 2, wxHORIZONTAL );
+#else
+	wxFlexGridSizer *sizersdlBrushSize = new wxFlexGridSizer( 2 );
+#endif
+
 	sizersdlBrushSize->Add( _sldBrushSize, 1, wxGROW );
 	sizersdlBrushSize->Add( _BrushSizeCtrl, 1,
 		wxALIGN_BOTTOM | wxALIGN_LEFT | wxALL, 5 );