From: abd Date: Thu, 17 Jul 2008 10:48:39 +0000 (+0000) Subject: Executable version on Windows Platform X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f04ee9944d88d4b9115bc1de2a1020167c2a1cdf;p=modules%2Fgeom.git Executable version on Windows Platform --- diff --git a/src/DlgRef/DlgRef.h b/src/DlgRef/DlgRef.h index f3f42a6cf..af098243e 100644 --- a/src/DlgRef/DlgRef.h +++ b/src/DlgRef/DlgRef.h @@ -716,7 +716,7 @@ public: namespace DlgRef { - QString PrintDoubleValue( double, int = 16 ); + DLGREF_EXPORT QString PrintDoubleValue( double, int = 16 ); }; #endif // GEOM_DLGREF_H diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx index 2be9e4c79..84daf12a6 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx @@ -158,8 +158,6 @@ void GEOMToolsGUI::OnCheckGeometry() void GEOMToolsGUI::OnAutoColor() { - QList aListOfGroups; - SALOME_ListIO selected; SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() ); if( !app ) diff --git a/src/OBJECT/GEOM_OBJECT_defs.hxx b/src/OBJECT/GEOM_OBJECT_defs.hxx index 3377ce908..c9d5ede46 100755 --- a/src/OBJECT/GEOM_OBJECT_defs.hxx +++ b/src/OBJECT/GEOM_OBJECT_defs.hxx @@ -26,22 +26,14 @@ #ifndef _GEOM_OBJECT_defs_HXX_ #define _GEOM_OBJECT_defs_HXX_ -#ifdef WNT - #if defined OBJECT_EXPORTS - #if defined WIN32 - #define GEOM_OBJECT_EXPORT __declspec( dllexport ) - #else - #define GEOM_OBJECT_EXPORT - #endif - #else - #if defined WIN32 - #define GEOM_OBJECT_EXPORT __declspec( dllimport ) - #else - #define GEOM_OBJECT_EXPORT - #endif - #endif +#ifdef WIN32 +# if defined GEOM_OBJECT_EXPORTS +# define GEOM_OBJECT_EXPORT __declspec( dllexport ) +# else +# define GEOM_OBJECT_EXPORT __declspec( dllimport ) +# endif #else - #define GEOM_OBJECT_EXPORT +# define GEOM_OBJECT_EXPORT #endif #endif diff --git a/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx index 8435e9a38..2dcecd1bd 100644 --- a/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx +++ b/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx @@ -41,7 +41,7 @@ #include #include -#include +#include //================================================================================= // class : PrimitiveGUI_BoxDlg()