From 7af622d565df13d20752aca9da98ae08d6b2f0d0 Mon Sep 17 00:00:00 2001 From: vsr Date: Thu, 11 Oct 2007 10:24:28 +0000 Subject: [PATCH] *** empty log message *** --- src/DisplayGUI/DisplayGUI.cxx | 46 ++++++++-------- src/DisplayGUI/DisplayGUI.h | 54 +++++++++---------- src/GEOMToolsGUI/GEOMToolsGUI_1.cxx | 2 +- .../GEOMToolsGUI_TransparencyDlg.cxx | 2 +- src/GEOMToolsGUI/GEOM_ToolsGUI.hxx | 2 +- 5 files changed, 50 insertions(+), 56 deletions(-) diff --git a/src/DisplayGUI/DisplayGUI.cxx b/src/DisplayGUI/DisplayGUI.cxx index c458fcec5..ce16392c5 100644 --- a/src/DisplayGUI/DisplayGUI.cxx +++ b/src/DisplayGUI/DisplayGUI.cxx @@ -1,35 +1,32 @@ -// GEOM GEOMGUI : GUI for Geometry component +// 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 +// 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 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 // +// File : DisplayGUI.cxx +// Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com) // -// -// File : DisplayGUI.cxx -// Author : Vadim SANDLER -// Module : GEOM -// $Header$ #include "DisplayGUI.h" -#include "GeometryGUI.h" -#include "GEOM_Displayer.h" -#include "GEOM_AISShape.hxx" +#include +#include +#include #include #include @@ -58,7 +55,6 @@ #include - //======================================================================= // function : DisplayGUI::DisplayGUI() // purpose : Constructor @@ -470,7 +466,7 @@ void DisplayGUI::ChangeDisplayMode( const int mode, SUIT_ViewWindow* viewWindow //===================================================================================== extern "C" { - GEOM_DISPLAYGUI_EXPORT + DISPLAYGUI_EXPORT GEOMGUI* GetLibGUI( GeometryGUI* parent ) { return new DisplayGUI( parent ); diff --git a/src/DisplayGUI/DisplayGUI.h b/src/DisplayGUI/DisplayGUI.h index 96d5b6044..475278b2d 100644 --- a/src/DisplayGUI/DisplayGUI.h +++ b/src/DisplayGUI/DisplayGUI.h @@ -1,43 +1,41 @@ -// GEOM GEOMGUI : GUI for Geometry component +// 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 +// 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 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 // +// File : DisplayGUI.h +// Author : Damien COQUERET, Open CASCADE S.A.S. // -// -// File : DisplayGUI.h -// Author : Damien COQUERET -// Module : GEOM #ifndef DISPLAYGUI_H #define DISPLAYGUI_H #include "GEOMGUI.h" -#ifdef WNT -# if defined DISPLAYGUI_EXPORTS -# define GEOM_DISPLAYGUI_EXPORT __declspec( dllexport ) -# else -# define GEOM_DISPLAYGUI_EXPORT __declspec( dllimport ) -# endif +#if defined WIN32 +# if defined DISPLAYGUI_EXPORTS +# define DISPLAYGUI_EXPORT __declspec( dllexport ) +# else +# define DISPLAYGUI_EXPORT __declspec( dllimport ) +# endif #else -# define GEOM_DISPLAYGUI_EXPORT +# define DISPLAYGUI_EXPORT #endif //================================================================================= @@ -46,7 +44,7 @@ //================================================================================= //class QAD_ViewFrame; class SUIT_ViewWindow; -class GEOM_DISPLAYGUI_EXPORT DisplayGUI : public GEOMGUI +class DISPLAYGUI_EXPORT DisplayGUI : public GEOMGUI { public: DisplayGUI( GeometryGUI* parent ); @@ -80,4 +78,4 @@ public: void ChangeDisplayMode( const int mode, SUIT_ViewWindow* viewWindo = 0 ); }; -#endif +#endif // DISPLAYGUI_H diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx index a258dccc1..b3e81b0d2 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : GEOMToolsGUI_1.cxx -// Author : Sergey ANIKIN, , Open CASCADE S.A.S. (sergey.anikin@opencascade.com) +// Author : Sergey ANIKIN, Open CASCADE S.A.S. (sergey.anikin@opencascade.com) // #include diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx index 3209eb1ef..88c86a4db 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx @@ -48,7 +48,7 @@ #include #include -7#include +#include #include #include #include diff --git a/src/GEOMToolsGUI/GEOM_ToolsGUI.hxx b/src/GEOMToolsGUI/GEOM_ToolsGUI.hxx index 1e5cd672a..5223cb970 100755 --- a/src/GEOMToolsGUI/GEOM_ToolsGUI.hxx +++ b/src/GEOMToolsGUI/GEOM_ToolsGUI.hxx @@ -25,7 +25,7 @@ #define GEOM_TOOLSGUI_HXX #if defined WIN32 -# if defined GEOMTOOLSGUI +# if defined GEOMTOOLSGUI_EXPORTS # define GEOMTOOLSGUI_EXPORT __declspec( dllexport ) # else # define GEOMTOOLSGUI_EXPORT __declspec( dllimport ) -- 2.39.2