#3145 creaContours Bug New Normal - changeWx28to30

[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..dc5ff99eb7cf1d09a2a3191d81985c4ac104b350 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>();
@@ -138,11 +143,15 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHOOSER_CHANGE )
        */
        void wxInstantChooserPanel :: addConcept(std::string aConceptName, int minV, int maxV, int actualV)
        {
+printf("EED wxInstantChooserPanel :: addConcept  Start\n");
                wxConceptControl * nwConcept = new wxConceptControl(this, _orientation, minV, maxV, actualV, aConceptName, _configuration);
                _concepts->push_back( nwConcept );
                _lastConceptUpdated = nwConcept;
+printf("EED wxInstantChooserPanel :: addConcept  1\n");
                _outSizer->Add(nwConcept, wxEXPAND);
+printf("EED wxInstantChooserPanel :: addConcept  2\n");
                Connect(nwConcept->GetId(), wxEVT_CONCEPT_RELEASE, (wxObjectEventFunction) (wxCommandEventFunction)  &wxInstantChooserPanel::onConceptRelease );
+printf("EED wxInstantChooserPanel :: addConcept  End\n");
        }
 
        void wxInstantChooserPanel :: setWxEventHandler( wxEvtHandler * theEventHandler )
@@ -155,13 +164,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;