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

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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.h
index cc9046cab5ca876ed3ae60d4bb275885d91407fc..9b24c188b1e050e22491a3952d24ff0c7206bacd 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.h
@@ -34,7 +34,7 @@
 //------------------------------------------------------------------
 
 
-class  MARACASVISULIB_EXPORTS vtkImageViewer2_XYZ{
+class  creaMaracasVisu_EXPORT vtkImageViewer2_XYZ{
 public:
        vtkImageViewer2_XYZ();
        ~vtkImageViewer2_XYZ();
@@ -62,11 +62,11 @@ protected:
 
 class wxVtkBaseView;
 
-class MARACASVISULIB_EXPORTS wxVTKRenderWindowInteractorPlus : public wxVTKRenderWindowInteractor
+class creaMaracasVisu_EXPORT wxVTKRenderWindowInteractorPlus : public wxVTKRenderWindowInteractor
 {
 public:
        wxVTKRenderWindowInteractorPlus(wxWindow *parent ,wxVtkBaseView *_wxvtkbaseview);
-       ~wxVTKRenderWindowInteractorPlus();
+       virtual ~wxVTKRenderWindowInteractorPlus();
 
        wxVTKRenderWindowInteractorPlus();
         void OnLeftDClick( wxMouseEvent& event );   
@@ -94,12 +94,12 @@ private:
 class vtkInteractorStyleBaseView;
 
 
-class MARACASVISULIB_EXPORTS wxVtkBaseView{
+class creaMaracasVisu_EXPORT wxVtkBaseView{
 public:
        wxVtkBaseView( );
        wxVtkBaseView( wxWindow *parent );
-       ~wxVtkBaseView();
-       wxVTKRenderWindowInteractor             *GetWxVTKRenderWindowInteractor();
+       virtual ~wxVtkBaseView();
+       wxVTKRenderWindowInteractor             *GetWxVTKRenderWindowInteractor() throw (char*);
        virtual void                                    Configure();
        virtual void                                    Refresh();
        virtual void                                    RefreshView();
@@ -132,10 +132,10 @@ class vtkInfoTextImageInteractor;
 //------------------------------------------------------------------
 
 
-class MARACASVISULIB_EXPORTS wxVtk2DBaseView: public wxVtkBaseView{
+class creaMaracasVisu_EXPORT wxVtk2DBaseView: public wxVtkBaseView{
 public:
        wxVtk2DBaseView(wxWindow *parent);
-       ~wxVtk2DBaseView();
+       virtual ~wxVtk2DBaseView();
        virtual void                    Configure(bool okimage=true);
        vtkImageViewer2_XYZ*    _imageViewer2XYZ;
        vtkBaseData*                    GetVtkBaseData();
@@ -173,11 +173,11 @@ protected:
 
 //------------------------------------------------------------------
 
-class MARACASVISULIB_EXPORTS InteractorStyleMaracas 
+class creaMaracasVisu_EXPORT InteractorStyleMaracas 
 {
 public:
        InteractorStyleMaracas();
-       ~InteractorStyleMaracas();
+       virtual ~InteractorStyleMaracas();
 
        virtual InteractorStyleMaracas * Clone();
        void CopyAttributesTo( InteractorStyleMaracas *cloneObject );
@@ -215,10 +215,10 @@ private:
 
 
 
-class MARACASVISULIB_EXPORTS manualInteractorWindowLevel : public InteractorStyleMaracas {
+class creaMaracasVisu_EXPORT manualInteractorWindowLevel : public InteractorStyleMaracas {
 public:
        manualInteractorWindowLevel();
-       ~manualInteractorWindowLevel();
+       virtual ~manualInteractorWindowLevel();
 protected:
 
        bool    _stateWindowLevel;
@@ -270,7 +270,7 @@ private:
 class vtkInfoTextImageInteractor : public InteractorStyleMaracas{
 public:
        vtkInfoTextImageInteractor();
-       ~vtkInfoTextImageInteractor();
+       virtual ~vtkInfoTextImageInteractor();
        void SetModelVtkInfoTextImage(vtkInfoTextImage *vtkinfotextimage);
        vtkInfoTextImage *GetVtkInfoTextImage();
 
@@ -289,7 +289,7 @@ private:
 class vtkInteractorScrollZ : public InteractorStyleMaracas {
 public:
        vtkInteractorScrollZ();
-       ~vtkInteractorScrollZ();
+       virtual ~vtkInteractorScrollZ();
 
        virtual bool  OnMouseMove();
        virtual bool  OnRightButtonDown();
@@ -318,7 +318,8 @@ private:
 
 class wxVtk3DBaseView;
 
-class MARACASVISULIB_EXPORTS vtkInteractorStyleBaseView : public vtkInteractorStyleImage{
+class creaMaracasVisu_EXPORT vtkInteractorStyleBaseView : public vtkInteractorStyleImage
+{
 public:
        vtkInteractorStyleBaseView();
        ~vtkInteractorStyleBaseView();
@@ -373,7 +374,7 @@ private:
 //------------------------------------------------------------------
 //------------------------------------------------------------------
 
-class MARACASVISULIB_EXPORTS vtkInteractorStyleBaseView2D : public vtkInteractorStyleBaseView{
+class creaMaracasVisu_EXPORT vtkInteractorStyleBaseView2D : public vtkInteractorStyleBaseView{
 public:
        vtkInteractorStyleBaseView2D();
        ~vtkInteractorStyleBaseView2D();
@@ -399,7 +400,7 @@ private:
 //------------------------------------------------------------------
 //------------------------------------------------------------------
 
-class MARACASVISULIB_EXPORTS vtkInteractorStyleBaseView3D : public vtkInteractorStyleBaseView {
+class creaMaracasVisu_EXPORT vtkInteractorStyleBaseView3D : public vtkInteractorStyleBaseView {
 public:
        vtkInteractorStyleBaseView3D();
        ~vtkInteractorStyleBaseView3D();
@@ -421,10 +422,10 @@ private:
 //------------------------------------------------------------------
 //------------------------------------------------------------------
 
-class MARACASVISULIB_EXPORTS wxVtk3DBaseView: public wxVtkBaseView{
+class creaMaracasVisu_EXPORT wxVtk3DBaseView: public wxVtkBaseView{
 public:
        wxVtk3DBaseView( wxWindow *parent );
-       ~wxVtk3DBaseView();
+       virtual ~wxVtk3DBaseView();
        vtkCamera*                      GetCamera();
        virtual vtkRenderer*            GetRenderer();
        virtual vtkRenderWindow*        GetRenWin();