X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FDisplayGUI%2FDisplayGUI.h;h=981c1c58f0a80b48e2af502e69298bcf8b5ba70c;hb=1d4b5b2a08784fdcf51a4bb0aba832ead67e8d9a;hp=7c96393f2e77f6edcc150fbe5cbe93a74c2576c3;hpb=ca91872e0ec3518b84c841c7673029d2e04dda9a;p=modules%2Fgeom.git diff --git a/src/DisplayGUI/DisplayGUI.h b/src/DisplayGUI/DisplayGUI.h index 7c96393f2..981c1c58f 100644 --- a/src/DisplayGUI/DisplayGUI.h +++ b/src/DisplayGUI/DisplayGUI.h @@ -17,25 +17,26 @@ // 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 #include "GEOMGUI.h" #include "GEOMBase.h" -#ifdef WNT -#include + +#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS +#define DISPLAYGUI_WNT_EXPORT __declspec( dllexport ) #else -#define SALOME_WNT_EXPORT +#define DISPLAYGUI_WNT_EXPORT #endif + //================================================================================= // class : GEOMBase_Display // purpose : @@ -44,15 +45,10 @@ class SUIT_ViewWindow; class DisplayGUI : public GEOMGUI { -protected: - DisplayGUI( GeometryGUI* parent ); // hide constructor to avoid direct creation - -public : +public: + DisplayGUI( GeometryGUI* parent ); ~DisplayGUI(); - // Get the only DisplayGUI object - static DisplayGUI* GetDisplayGUI( GeometryGUI* parent ); - // Dispatch menu command bool OnGUIEvent(int theCommandID, SUIT_Desktop* parent); @@ -79,9 +75,6 @@ public : // Set display mode for selected objects in the viewer given // (current viewer if = 0 ) void ChangeDisplayMode( const int mode, SUIT_ViewWindow* viewWindo = 0 ); - -private: - static DisplayGUI* myGUIObject; // the only DisplayGUI object }; #endif