Join modifications from BR_Dev_For_4_0 tag V4_1_1.

[modules/smesh.git] / src / SMESHGUI / SMESHGUI_Displayer.h

diff --git a/src/SMESHGUI/SMESHGUI_Displayer.h b/src/SMESHGUI/SMESHGUI_Displayer.h
index b8458e6c7cf437dcebbc4aab3b91eea074d2e6a0..dc2df5f8bc70249ad6a52f9d77f1a664a0b61223 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_Displayer.h
+++ b/src/SMESHGUI/SMESHGUI_Displayer.h
@@ -17,7 +17,7 @@
 //  License along with this library; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //
 //
@@ -29,20 +29,27 @@
 #ifndef SMESHGUI_DISPLAYER_HEADER
 #define SMESHGUI_DISPLAYER_HEADER
 
-#include <SalomeApp_Displayer.h>
+#include "SMESH_SMESHGUI.hxx"
 
+#include <LightApp_Displayer.h>
+
+class SalomeApp_Application;
 class SalomeApp_Study;
 
-class SMESHGUI_Displayer : public SalomeApp_Displayer
+class SMESHGUI_EXPORT SMESHGUI_Displayer : public LightApp_Displayer
 {
 public:
-  SMESHGUI_Displayer( SalomeApp_Study* );
+  SMESHGUI_Displayer( SalomeApp_Application* );
   ~SMESHGUI_Displayer();
 
   virtual SALOME_Prs* buildPresentation( const QString&, SALOME_View* = 0 );
+  virtual bool        canBeDisplayed( const QString& /*entry*/, const QString& /*viewer_type*/ ) const;
+
+protected:
+  SalomeApp_Study* study() const;
 
 private:
-  SalomeApp_Study*   myStudy;
+  SalomeApp_Application*   myApp;
 };
 
 #endif