X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FpPlotter%2Fmathplot.h;h=743bc54d5cca32ab867b1995d1ce8dce58493a1f;hb=d6fb1d5d3e478c70b90f5a4e27874e1478905195;hp=0856926539196dbf1f63d73607b18d976191d6d8;hpb=cc00f80af2e160ce2af3ddd2903c4a41c023cc94;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mathplot.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mathplot.h
index 0856926..743bc54 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mathplot.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mathplot.h
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
 /////////////////////////////////////////////////////////////////////////////
 // Name:        mathplot.h
 // Purpose:     Framework for mathematical graph plotting in wxWindows
@@ -440,6 +465,7 @@ public:
 		int flags = 0);
 	~mpWindow();
 
+
 	/** Get reference to context menu of the plot canvas.
 	@return Pointer to menu. The menu can be modified.
 	*/
@@ -892,13 +918,22 @@ protected:
 	*/
 	 int type;
 
+
  private:
 	//bitmap of functions
 	wxBitmap        *_bitmap_functions;
 
 
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
 	DECLARE_CLASS(mpWindow)
+#else
+	wxDECLARE_DYNAMIC_CLASS(mpWindow);
+#endif
+
 	DECLARE_EVENT_TABLE()
+
+
 };
 
 #endif // _MP_MATHPLOT_H_