From b1676e0b31b61b8b7c42723cbb911f4cb5198c27 Mon Sep 17 00:00:00 2001 From: ouv Date: Thu, 6 Apr 2006 08:51:06 +0000 Subject: [PATCH] Windows porting. --- src/SVTK/SVTK_DeviceActor.h | 4 +++- src/SVTK/SVTK_InteractorStyle.h | 4 ++-- src/SVTK/SVTK_Selector.h | 3 ++- src/SVTK/SVTK_ViewWindow.h | 6 ++++++ 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/SVTK/SVTK_DeviceActor.h b/src/SVTK/SVTK_DeviceActor.h index f8a49bc36..38378d295 100644 --- a/src/SVTK/SVTK_DeviceActor.h +++ b/src/SVTK/SVTK_DeviceActor.h @@ -44,6 +44,8 @@ class vtkDataSet; class vtkShrinkFilter; class vtkDataSetMapper; +#include "SVTK.h" + //---------------------------------------------------------------------------- namespace SVTK { @@ -59,7 +61,7 @@ namespace SVTK //---------------------------------------------------------------------------- -class SVTK_DeviceActor: public vtkLODActor +class SVTK_EXPORT SVTK_DeviceActor: public vtkLODActor { public: vtkTypeMacro(SVTK_DeviceActor,vtkLODActor); diff --git a/src/SVTK/SVTK_InteractorStyle.h b/src/SVTK/SVTK_InteractorStyle.h index 7ea671df4..97a9ecdb7 100644 --- a/src/SVTK/SVTK_InteractorStyle.h +++ b/src/SVTK/SVTK_InteractorStyle.h @@ -51,7 +51,7 @@ This class controls of value of increment, for pan/rotate/zoom operations in SALOME way */ -class SVTK_ControllerIncrement : public vtkObject{ +class SVTK_EXPORT SVTK_ControllerIncrement : public vtkObject{ public: vtkTypeMacro(SVTK_ControllerIncrement, vtkObject); static SVTK_ControllerIncrement* New(); @@ -83,7 +83,7 @@ class SVTK_ControllerIncrement : public vtkObject{ This class controls the behaviour of KeyDown event in SALOME way */ -class SVTK_ControllerOnKeyDown : public vtkObject{ +class SVTK_EXPORT SVTK_ControllerOnKeyDown : public vtkObject{ public: vtkTypeMacro(SVTK_ControllerOnKeyDown, vtkObject); static SVTK_ControllerOnKeyDown* New(); diff --git a/src/SVTK/SVTK_Selector.h b/src/SVTK/SVTK_Selector.h index 37ec0acb1..8d8fec33c 100644 --- a/src/SVTK/SVTK_Selector.h +++ b/src/SVTK/SVTK_Selector.h @@ -29,6 +29,7 @@ #ifndef SVTK_SELECTOR_H #define SVTK_SELECTOR_H +#include "SVTK.h" #include "SVTK_Selection.h" #include "SALOME_ListIO.hxx" #include "VTKViewer_Filter.h" @@ -49,7 +50,7 @@ class SALOME_Actor; \note Also, for each #SALOME_InteractiveObject it tries to keep corresponding refenrence to #SALOME_Actor */ -class SVTK_Selector: public vtkObject +class SVTK_EXPORT SVTK_Selector: public vtkObject { public: static SVTK_Selector* New(); diff --git a/src/SVTK/SVTK_ViewWindow.h b/src/SVTK/SVTK_ViewWindow.h index 1fc559c78..0c1479a39 100755 --- a/src/SVTK/SVTK_ViewWindow.h +++ b/src/SVTK/SVTK_ViewWindow.h @@ -334,6 +334,12 @@ protected: SVTK_ViewModelBase* myModel; }; +extern "C" +{ +SVTK_EXPORT + int convertAction( const int accelAction ); +}; + #ifdef WIN32 #pragma warning( default:4251 ) #endif -- 2.39.2