X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FpPlotter%2FpPlotter.cxx;h=c6d803e05e23014b2513cfbe8f2c00c944754fb8;hb=25e3adf442d6a8d357d52410267445c54426c525;hp=1e80597db847ec10a8969e9f9cd9a0de58152e87;hpb=4ecb6789d069c8dcd40724f03d8225c25629cd52;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotter.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotter.cxx index 1e80597..c6d803e 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotter.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotter.cxx @@ -229,10 +229,20 @@ void pPlotter::setAll() text.Clear(); text = _T("minX="); double realMin_X = actualFunction->getMinX(); +//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0 +#if wxMAJOR_VERSION <= 2 text = text + realMin_X; +#else + text = text + wxString::FromDouble( realMin_X ); +#endif text = text + _T(" maxX="); double realMax_X = actualFunction->getMaxX(); +//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0 +#if wxMAJOR_VERSION <= 2 text = text + realMax_X; +#else + text = text + wxString::FromDouble( realMax_X ); +#endif int minShowed = actualFunction->getMinXShowed(); int maxShowed = actualFunction->getMaxXShowed(); barrange -> setRepresentedValues (realMin_X, realMax_X);