- Comment out uselesss #define MAX (vtk-4.5 doesn't compile)

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / wxMPRBaseData.h

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRBaseData.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRBaseData.h
index 37a4ff8326f1262166fe981f878fd9bf58873250..71beb886ac3e3832fed0b87a6835fdf7efffa171 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRBaseData.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRBaseData.h
@@ -48,10 +48,10 @@
 //------------------------------------------------------------------
 //------------------------------------------------------------------
 
-class MARACASVISULIB_EXPORTS vtkBaseData {
+class creaMaracasVisu_EXPORT vtkBaseData {
 public:
        vtkBaseData();
-       ~vtkBaseData();
+       virtual ~vtkBaseData();
        vtkImageData*   GetImageData();
        marImageData*   GetMarImageData();
                        void    SetMarImageData(marImageData *marimagedata);
@@ -73,10 +73,10 @@ protected:
 //------------------------------------------------------------------
 //------------------------------------------------------------------
 
-class MARACASVISULIB_EXPORTS vtkMPRBaseData: public vtkBaseData{
+class creaMaracasVisu_EXPORT vtkMPRBaseData: public vtkBaseData{
 public:
        vtkMPRBaseData();
-       ~vtkMPRBaseData();
+       virtual ~vtkMPRBaseData();
        virtual void                    Configure();
        int                                             GetMaxPositionX( );
        int                                             GetMaxPositionY( );
@@ -103,10 +103,10 @@ private:
 //------------------------------------------------------------------
 //------------------------------------------------------------------
 
-class MARACASVISULIB_EXPORTS vtkMPR3DDataViewer {
+class creaMaracasVisu_EXPORT vtkMPR3DDataViewer {
 public:
        vtkMPR3DDataViewer();
-       ~vtkMPR3DDataViewer();
+       virtual ~vtkMPR3DDataViewer();
        vtkImageActor*                  GetImageActor(int id);
        vtkActor*                               GetOutlineActor();
        virtual void                    Refresh();
@@ -232,7 +232,7 @@ public:
        //Constructo-Destructor
        //----------------------
        vtkClipping3DDataViewer();
-       ~vtkClipping3DDataViewer();
+       virtual ~vtkClipping3DDataViewer();
 
 //     vtkImageActor*                  GetImageActor(int id);
        vtkActor*                               GetOutlineActor();