PAL12488: Cannot set a working plane (in second study). Suppress using static member.

diff --git a/src/BasicGUI/BasicGUI.cxx b/src/BasicGUI/BasicGUI.cxx
index 40e1f2aaf72c01edca4135df70b27684fa5ffeea..8c47c0f4bbdb8a40c74d4403e012d4bd4b97f8d2 100644 (file)
--- a/src/BasicGUI/BasicGUI.cxx
+++ b/src/BasicGUI/BasicGUI.cxx
@@ -1,23 +1,23 @@
 //  GEOM GEOMGUI : GUI for Geometry component
 //
 //  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-// 
-//  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. 
-// 
-//  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
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+//  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.
+//
+//  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
 //
 //
 //
@@ -57,18 +57,13 @@
 
 using namespace std;
 
-BasicGUI* BasicGUI::myGUIObject = 0;
-
 //=======================================================================
 // function : GetBasicGUI()
 // purpose  : Get the only BasicGUI object [ static ]
 //=======================================================================
 BasicGUI* BasicGUI::GetBasicGUI( GeometryGUI* parent )
 {
-  if ( myGUIObject == 0 ) {
-    myGUIObject = new BasicGUI( parent );
-  }
-  return myGUIObject;
+  return new BasicGUI( parent );
 }
 
 //=======================================================================
@@ -80,7 +75,6 @@ BasicGUI::BasicGUI( GeometryGUI* parent ) :
 {
 }
 
-
 //=======================================================================
 // function : ~BasicGUI()
 // purpose  : Destructor

diff --git a/src/BasicGUI/BasicGUI.h b/src/BasicGUI/BasicGUI.h
index 066c2e7d28b8f2e14034a22a888a8df43fcab89d..210a264e015d74b9a2e257d3d353e0a263980b5a 100644 (file)
--- a/src/BasicGUI/BasicGUI.h
+++ b/src/BasicGUI/BasicGUI.h
@@ -1,30 +1,29 @@
 //  GEOM GEOMGUI : GUI for Geometry component
 //
 //  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-// 
-//  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. 
-// 
-//  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
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+//  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.
+//
+//  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
 //
 //
 //
 //  File   : BasicGUI.h
 //  Author : Damien COQUERET
 //  Module : GEOM
-//  $Header$
 
 #ifndef BASICGUI_H
 #define BASICGUI_H
@@ -33,12 +32,12 @@
 #include "GEOMBase.h"
 #include <V3d_View.hxx>
 
-
 #if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
 #define BASICGUI_WNT_EXPORT __declspec( dllexport )
 #else
 #define BASICGUI_WNT_EXPORT
 #endif
+
 //=================================================================================
 // class    : BasicGUI
 // purpose  :
@@ -48,7 +47,7 @@ class BasicGUI : public GEOMGUI
 protected:
   BasicGUI( GeometryGUI* parent ); // hide constructor to avoid direct creation
 
-public :
+public:
   ~BasicGUI();
 
   // Get the only BasicGUI object
@@ -58,9 +57,6 @@ public :
   bool OnMousePress(QMouseEvent* pe, SUIT_Desktop* parent, SUIT_ViewWindow* theViewWindow);
 
   gp_Pnt ConvertClickToPoint( int x, int y, Handle(V3d_View) aView );
-
-private:
-  static BasicGUI* myGUIObject;        // the only BasicGUI object
 };
 
 #endif