#3334 creaContours Feature New Normal - Control Refresh events from bbtk

[creaContours.git] / lib / Interface_ManagerContour_NDimensions / wxInstantChooserPanel.cxx

diff --git a/lib/Interface_ManagerContour_NDimensions/wxInstantChooserPanel.cxx b/lib/Interface_ManagerContour_NDimensions/wxInstantChooserPanel.cxx
index a4de255267091ed5b92f9d2eed094029eda0cf5d..e47a1ad1563426eeb050887f96eef944aa5cd065 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxInstantChooserPanel.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxInstantChooserPanel.cxx
@@ -96,7 +96,12 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHOOSER_CHANGE )
                setVerticalMaxSelectedNums( groupConfig );
                
                SetSize(size);
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
                _outSizer = new wxFlexGridSizer ( 1, 10, 10);
+#else
+               _outSizer = new wxFlexGridSizer ( 10);
+#endif
                _orientation = theOrientation;
                initializeResolutionSlider();
                _actualInstant=new std::map<std::string,int>();
@@ -155,13 +160,13 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHOOSER_CHANGE )
        //------------------------------------------------------------------------------------------------------------
        void wxInstantChooserPanel :: onResolutionSlider(wxScrollEvent& event)
        {
-               std::string lasConcept = _lastConceptUpdated->getName();
-               int value = _lastConceptUpdated->getActualValue();
-               int min = _lastConceptUpdated->getMinValue();
-               int max = _lastConceptUpdated->getMaxValue();
-               int delta = (int) (pow((double) 2, _resolutionSlider->GetValue() ));
-               int minTmp   = value - delta/2;
-               int maxTmp   = value + delta/2;
+               std::string lasConcept  = _lastConceptUpdated->getName();
+               int value                               = _lastConceptUpdated->getActualValue();
+               int min                                 = _lastConceptUpdated->getMinValue();
+               int max                                 = _lastConceptUpdated->getMaxValue();
+               int delta                               = (int) (pow((double) 2, _resolutionSlider->GetValue() ));
+               int minTmp                      = value - delta/2;
+               int maxTmp                      = value + delta/2;
                if (minTmp<min)
                        {
                                minTmp = min;