X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FpPlotter%2FpPlotterLayer.h;h=1e6ef4d645011bbd6467fc1915f34e3970d6f697;hb=80b04dc9e3b981e24fe9ae0d81cdeb8af6e6f8c1;hp=1c9022e1e4f370ea6224da3af41cb11cce80958c;hpb=e4ef2b5df5aac431ff3b806f83b7dd5e55e89d86;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterLayer.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterLayer.h index 1c9022e..1e6ef4d 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterLayer.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterLayer.h @@ -213,11 +213,21 @@ void draw(wxDC & dc,mpWindow & w,double x1,double y1,double x2,double y2, int or */ virtual bool GetNextXY(double & x, double & y){return false;} +//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0 +#if wxMAJOR_VERSION <= 2 /** Get Point list of the funcion @param return points */ virtual void GetPoints(wxList &points){} +#else + /** + Get Point list of the funcion + @param return points + */ + virtual wxList* GetPointsPtr(){ } +#endif + /** Layer plot handler. This implementation will plot the locus in the visible area and @@ -250,10 +260,17 @@ void draw(wxDC & dc,mpWindow & w,double x1,double y1,double x2,double y2, int or protected: int m_flags; //!< Holds label alignment + +//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0 +#if wxMAJOR_VERSION <= 2 /* * Points of the function thats is drawing */ wxList points; +#else + // use GetPointsPtr() +#endif + /* * the scale in x, with wich it must draw */