X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxVtkBaseView.h;h=9b24c188b1e050e22491a3952d24ff0c7206bacd;hb=1bf58cfa1758464b422d1d0cca808e528043e691;hp=fce85df79ee09ef8e39876798e01359ebcbdc48c;hpb=206564e24c5c40e1f8830bfd17ebb4cc99175ec2;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.h
index fce85df..9b24c18 100644
--- 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 );
 	virtual ~wxVtkBaseView();
-	wxVTKRenderWindowInteractor		*GetWxVTKRenderWindowInteractor();
+	wxVTKRenderWindowInteractor		*GetWxVTKRenderWindowInteractor() throw (char*);
 	virtual void					Configure();
 	virtual void					Refresh();
 	virtual void					RefreshView();
@@ -132,7 +132,7 @@ class vtkInfoTextImageInteractor;
 //------------------------------------------------------------------
 
 
-class MARACASVISULIB_EXPORTS wxVtk2DBaseView: public wxVtkBaseView{
+class creaMaracasVisu_EXPORT wxVtk2DBaseView: public wxVtkBaseView{
 public:
 	wxVtk2DBaseView(wxWindow *parent);
 	virtual ~wxVtk2DBaseView();
@@ -173,7 +173,7 @@ protected:
 
 //------------------------------------------------------------------
 
-class MARACASVISULIB_EXPORTS InteractorStyleMaracas 
+class creaMaracasVisu_EXPORT InteractorStyleMaracas 
 {
 public:
 	InteractorStyleMaracas();
@@ -215,7 +215,7 @@ private:
 
 
 
-class MARACASVISULIB_EXPORTS manualInteractorWindowLevel : public InteractorStyleMaracas {
+class creaMaracasVisu_EXPORT manualInteractorWindowLevel : public InteractorStyleMaracas {
 public:
 	manualInteractorWindowLevel();
 	virtual ~manualInteractorWindowLevel();
@@ -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,7 +422,7 @@ private:
 //------------------------------------------------------------------
 //------------------------------------------------------------------
 
-class MARACASVISULIB_EXPORTS wxVtk3DBaseView: public wxVtkBaseView{
+class creaMaracasVisu_EXPORT wxVtk3DBaseView: public wxVtkBaseView{
 public:
 	wxVtk3DBaseView( wxWindow *parent );
 	virtual ~wxVtk3DBaseView();