Merge from V6_main_20120808 08Aug12

[modules/yacs.git] / src / salomewrap / SalomeWrap_Module.hxx

diff --git a/src/salomewrap/SalomeWrap_Module.hxx b/src/salomewrap/SalomeWrap_Module.hxx
index cebed00aeeff27dd88fa80b31fecdfd50c8427d7..43420afba00297d8568b59842cafa911210d9f25 100644 (file)
--- a/src/salomewrap/SalomeWrap_Module.hxx
+++ b/src/salomewrap/SalomeWrap_Module.hxx
@@ -1,29 +1,33 @@
-//  Copyright (C) 2006-2008  CEA/DEN, EDF R&D
+// Copyright (C) 2006-2012  CEA/DEN, EDF R&D
 //
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
 //
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
 //
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+// You should have received a copy of the GNU Lesser General Public
+// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #ifndef _SALOMEWRAP_MODULE_HXX_
 #define _SALOMEWRAP_MODULE_HXX_
 
+#include "SalomeWrapExport.hxx"
+
 #include <SalomeApp_Module.h>
 #include <SALOMEconfig.h>
 
 #include <QGraphicsScene>
 #include <QGraphicsView>
+#include <QDockWidget>
 
 #include <map>
 
@@ -32,7 +36,7 @@ class QxScene_ViewWindow;
 
 class SalomeWrap_DataModel;
 
-class SalomeWrap_Module: public SalomeApp_Module
+class SALOMEWRAP_EXPORT SalomeWrap_Module: public SalomeApp_Module
 {
   Q_OBJECT
 
@@ -46,6 +50,8 @@ public:
 
   int activeStudyId();
 
+  QDockWidget* objectBrowser();
+
   QAction* wCreateAction(const int id,
                          const QString& toolTip,
                          const QIcon& icon,
@@ -119,6 +125,7 @@ protected:
   virtual  CAM_DataModel* createDataModel();
 
   std::map<QGraphicsScene*, QxScene_ViewWindow*> _mapOfViewWindow;
+
 };
 
 #endif