X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOMGUI%2FGEOMGUI.cxx;h=97fc874aa52b3d24818329aa1cfaee5eb68ba007;hb=144524d7be0c8389b25a57b7fcf831f0724e9e22;hp=8159278750c777d6cd36bc98a9f26b4d5378485a;hpb=d3dd282390888d7dc091ba2c2ffe7923bd7458e6;p=modules%2Fgeom.git

diff --git a/src/GEOMGUI/GEOMGUI.cxx b/src/GEOMGUI/GEOMGUI.cxx
index 815927875..97fc874aa 100644
--- a/src/GEOMGUI/GEOMGUI.cxx
+++ b/src/GEOMGUI/GEOMGUI.cxx
@@ -28,17 +28,20 @@
 
 #include "GEOMGUI.h"
 
-#include "QAD_Desktop.h"
-#include "QAD_StudyFrame.h"
-#include "QAD_Application.h"
+#include "SUIT_Desktop.h"
+#include "SUIT_ViewWindow.h"
+
+#include "GeometryGUI.h"
+
 #include <qevent.h>
 
 //=================================================================================
 // class    : GEOMGUI::GEOMGUI
 // purpose  : Constructor
 //=================================================================================
-GEOMGUI::GEOMGUI( QObject* parent ) : 
-  QObject ( parent )
+GEOMGUI::GEOMGUI( GeometryGUI* parent ) : 
+QObject ( parent ),
+myGeometryGUI( parent )
 {
 }
 
@@ -54,7 +57,7 @@ GEOMGUI::~GEOMGUI()
 // class    : GEOMGUI::OnGUIEvent
 // purpose  : Main/popup menu events processing
 //=================================================================================
-bool GEOMGUI::OnGUIEvent( int /*theCommandID*/, QAD_Desktop* /*parent*/ )
+bool GEOMGUI::OnGUIEvent( int /*theCommandID*/, SUIT_Desktop* /*parent*/ )
 {
   return TRUE;
 }
@@ -64,7 +67,7 @@ bool GEOMGUI::OnGUIEvent( int /*theCommandID*/, QAD_Desktop* /*parent*/ )
 // purpose  : Mouse press event processing. Should return FALSE to let the event 
 //            be processed further.
 //=================================================================================
-bool GEOMGUI::OnMousePress( QMouseEvent* /*pe*/, QAD_Desktop* /*parent*/, QAD_StudyFrame* /*studyFrame*/ )
+bool GEOMGUI::OnMousePress( QMouseEvent* /*pe*/, SUIT_Desktop* /*parent*/, SUIT_ViewWindow* /*studyFrame*/ )
 {
   return FALSE;
 }
@@ -73,7 +76,7 @@ bool GEOMGUI::OnMousePress( QMouseEvent* /*pe*/, QAD_Desktop* /*parent*/, QAD_St
 // class    : GEOMGUI::OnMouseMove
 // purpose  : Mouse move event processing
 //=================================================================================
-bool GEOMGUI::OnMouseMove( QMouseEvent* /*pe*/, QAD_Desktop* /*parent*/, QAD_StudyFrame* /*studyFrame*/ )
+bool GEOMGUI::OnMouseMove( QMouseEvent* /*pe*/, SUIT_Desktop* /*parent*/, SUIT_ViewWindow* /*studyFrame*/ )
 {
   return TRUE;
 }
@@ -82,7 +85,7 @@ bool GEOMGUI::OnMouseMove( QMouseEvent* /*pe*/, QAD_Desktop* /*parent*/, QAD_Stu
 // class    : GEOMGUI::OnKeyPress
 // purpose  : Key press event processing
 //=================================================================================
-bool GEOMGUI::OnKeyPress( QKeyEvent* /*pe*/, QAD_Desktop* /*parent*/, QAD_StudyFrame* /*studyFrame*/ )
+bool GEOMGUI::OnKeyPress( QKeyEvent* /*pe*/, SUIT_Desktop* /*parent*/, SUIT_ViewWindow* /*studyFrame*/ )
 {
   return TRUE;
 }
@@ -91,25 +94,24 @@ bool GEOMGUI::OnKeyPress( QKeyEvent* /*pe*/, QAD_Desktop* /*parent*/, QAD_StudyF
 // class    : GEOMGUI::SetSettings
 // purpose  : Called when GEOM component is activated
 //=================================================================================
-bool GEOMGUI::SetSettings( QAD_Desktop* /*parent*/ )
+void GEOMGUI::activate( SUIT_Desktop* /*parent*/ )
 {
-  return TRUE;
 }
 
 //=================================================================================
 // class    : GEOMGUI::Deactivate
 // purpose  : Called when GEOM component is deactivated
 //=================================================================================
-void GEOMGUI::Deactivate()
+void GEOMGUI::deactivate()
 {
 }
 
 //=================================================================================
-// class    : GEOMGUI::ActiveStudyChanged
-// purpose  : Called when active study changed
+// class    : GEOMGUI::Deactivate
+// purpose  : Called when GEOM component is deactivated
 //=================================================================================
-bool GEOMGUI::ActiveStudyChanged( QAD_Desktop* /*parent*/ )
+GeometryGUI* GEOMGUI::getGeometryGUI()
 {
-  return TRUE;
+  return myGeometryGUI;
 }