#3331 creaMaracasVisu Bug New Normal - Select contour with 2 points, HelpViewerNV

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / manualPaint / wxManualPaintPanel.cpp

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/wxManualPaintPanel.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/wxManualPaintPanel.cpp
index 4e8a54c403cac5fd3bbddc25d0b06d9b7708d9bc..57fd497a452561a4a12581e93187cf765dd599f6 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/wxManualPaintPanel.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/wxManualPaintPanel.cpp
@@ -37,7 +37,7 @@ wxManualPaintPanel::wxManualPaintPanel( wxWindow * parent )
        //Title
        sizer->Add( tittleText );
        //giving some blank spaces
-       sizer->Add( new wxStaticText( this, -1, _T("             ") ) );
+       sizer->Add( new wxStaticText( this, -1, _T("          key A : Enable/Disable   ") ) );
 
        this->ConfigureActiveCBButton( );
        this->ConfigureBrushToolRadioButton( );
@@ -61,8 +61,7 @@ wxManualPaintPanel::wxManualPaintPanel( wxWindow * parent )
        this->_gConfigSizer = new wxFlexGridSizer( 1 );
        //BrushTool Radio Button
        //giving blank space
-       this->_gConfigSizer->Add(
-               new wxStaticText( this, -1, _T("             ") ) );
+       this->_gConfigSizer->Add(  new wxStaticText( this, -1, _T("             ") ) );
        //end of blank space
        this->_gConfigSizer->Add( _rbBrushTool, 1, wxGROW );
        //2D/3D Radio Button
@@ -73,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 );
@@ -88,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 );