Merging with WPdev

[modules/geom.git] / src / DisplayGUI / DisplayGUI.h

diff --git a/src/DisplayGUI/DisplayGUI.h b/src/DisplayGUI/DisplayGUI.h
index bf2b57ac1519423e4faf99244a7ad1ed4625015c..9e31f223c91686a9df8331ce7c60c4d12dc36c0f 100644 (file)
--- a/src/DisplayGUI/DisplayGUI.h
+++ b/src/DisplayGUI/DisplayGUI.h
@@ -17,14 +17,13 @@
 //  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
 //
 //
 //
 //  File   : DisplayGUI.h
 //  Author : Damien COQUERET
 //  Module : GEOM
-//  $Header$
 
 #ifndef DISPLAYGUI_H
 #define DISPLAYGUI_H
@@ -32,24 +31,30 @@
 #include "GEOMGUI.h"
 #include "GEOMBase.h"
 
+#ifdef WNT
+# if defined DISPLAYGUI_EXPORTS
+#  define GEOM_DISPLAYGUI_EXPORT __declspec( dllexport )
+# else
+#  define GEOM_DISPLAYGUI_EXPORT __declspec( dllimport )
+# endif
+#else
+# define GEOM_DISPLAYGUI_EXPORT
+#endif
+
 //=================================================================================
 // class    : GEOMBase_Display
 // purpose  :
 //=================================================================================
-class QAD_ViewFrame;
-class DisplayGUI : public GEOMGUI
+//class QAD_ViewFrame;
+class SUIT_ViewWindow;
+class GEOM_DISPLAYGUI_EXPORT DisplayGUI : public GEOMGUI
 {
-protected:
-  DisplayGUI(); // hide constructor to avoid direct creation
-
-public :
+public:
+  DisplayGUI( GeometryGUI* parent );
   ~DisplayGUI();
 
-  // Get the only DisplayGUI object
-  static DisplayGUI* GetDisplayGUI();
-
   // Dispatch menu command
-  bool OnGUIEvent(int theCommandID, QAD_Desktop* parent);
+  bool OnGUIEvent(int theCommandID, SUIT_Desktop* parent);
 
   // Display all GEOM objects
   void DisplayAll();
@@ -63,20 +68,17 @@ public :
   void Erase();
 
   // DISPLAY MODE methods : 0 - wireframe, 1 - shading
-  // Set display mode for the viewer (current viewer if <viewFrame> - 0 )
-  void SetDisplayMode( const int mode, QAD_ViewFrame* viewFrame = 0 );
-  // Get display mode of the viewer (current viewer if <viewFrame> - 0 )
-  int  GetDisplayMode( QAD_ViewFrame* viewFrame = 0 );
+  // Set display mode for the viewer (current viewer if <viewWindow> - 0 )
+  void SetDisplayMode( const int mode, SUIT_ViewWindow* viewWindow = 0 );
+  // Get display mode of the viewer (current viewer if <viewWindow> - 0 )
+  int  GetDisplayMode( SUIT_ViewWindow* viewWindow = 0 );
   // Invert display mode ( shadin <-> wireframe ) for the viewer 
-  // (current viewer if <viewFrame> = 0 )
-  void InvertDisplayMode( QAD_ViewFrame* viewFrame = 0 );
+  // (current viewer if <viewWindow> = 0 )
+  void InvertDisplayMode( SUIT_ViewWindow* viewWindow = 0 );
 
   // Set display mode for selected objects in the viewer given
-  // (current viewer if <viewFrame> = 0 )
-  void ChangeDisplayMode( const int mode, QAD_ViewFrame* viewFrame = 0 );
-
-private:
-  static DisplayGUI* myGUIObject;        // the only DisplayGUI object
+  // (current viewer if <viewWindow> = 0 )
+  void ChangeDisplayMode( const int mode, SUIT_ViewWindow* viewWindo = 0 );
 };
 
 #endif