From: smh <smh@opencascade.com>
Date: Thu, 22 Apr 2004 14:00:39 +0000 (+0000)
Subject: Implementation of inheritance from base class SALOMEGUI
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2FEvent_Server;p=modules%2Fgeom.git

Implementation of inheritance from base class SALOMEGUI
---

diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx
index 124bac75b..ed8e12e72 100644
--- a/src/GEOMGUI/GeometryGUI.cxx
+++ b/src/GEOMGUI/GeometryGUI.cxx
@@ -529,7 +529,7 @@ bool GeometryGUI::CustomPopup(QAD_Desktop* parent, QPopupMenu* popup, const QStr
 // function : activeStudyChanged()
 // purpose  : static
 //=================================================================================
-void GeometryGUI::activeStudyChanged(QAD_Desktop* parent)
+bool GeometryGUI::ActiveStudyChanged(QAD_Desktop* parent)
 {
   GeometryGUI::GetOrCreateGeometryGUI(parent); 
 
@@ -562,7 +562,7 @@ void GeometryGUI::activeStudyChanged(QAD_Desktop* parent)
   // PAL5356: update VTK selection
   ::UpdateVtkSelection(parent);
 
-  return;
+  return true;
 }
 
 
@@ -600,3 +600,11 @@ void GeometryGUI::Deactivate()
   if ( GeomGUI )
     GeomGUI->EmitSignalCloseAllDialogs();
 }
+
+static GeometryGUI aGUI("");
+extern "C"
+{
+  Standard_EXPORT SALOMEGUI* GetComponentGUI() {
+    return &aGUI;
+  }
+}
diff --git a/src/GEOMGUI/GeometryGUI.h b/src/GEOMGUI/GeometryGUI.h
index 2d5fc45dc..06649f622 100644
--- a/src/GEOMGUI/GeometryGUI.h
+++ b/src/GEOMGUI/GeometryGUI.h
@@ -41,7 +41,7 @@ class GeometryGUI : public SALOMEGUI
   Q_OBJECT /* for QT compatibility */
 
 public :
-  GeometryGUI( const QString& name, QObject* parent = 0 );
+  GeometryGUI( const QString& name = "", QObject* parent = 0 );
   ~GeometryGUI();
   
   static GEOMContext* GetOrCreateGeometryGUI(QAD_Desktop* desktop);
@@ -52,7 +52,7 @@ public :
   virtual bool OnMouseMove(QMouseEvent* pe, QAD_Desktop* parent, QAD_StudyFrame* studyFrame);
   virtual bool OnKeyPress(QKeyEvent* pe, QAD_Desktop* parent, QAD_StudyFrame* studyFrame);
   virtual bool SetSettings(QAD_Desktop* parent);
-  virtual void activeStudyChanged(QAD_Desktop* parent);
+  virtual bool ActiveStudyChanged(QAD_Desktop* parent);
   virtual void BuildPresentation(const Handle(SALOME_InteractiveObject)&);
   virtual void DefinePopup(QString & theContext, QString & theParent, QString & theObject);
   virtual bool CustomPopup(QAD_Desktop* parent, QPopupMenu* popup, const QString& theContext,