ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-01-01 04:10:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merging with BR_WPdev_For_5_0

Browse Source
This commit is contained in:
abd 2008-08-08 07:30:39 +00:00
parent 917ced834c
commit c9fc0eec6a
4 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/DlgRef/DlgRef.h
View File

@ -766,7 +766,7 @@ public:
namespace DlgRef namespace DlgRef
{ {
QString PrintDoubleValue( double, int = 16 ); DLGREF_EXPORT QString PrintDoubleValue( double, int = 16 );
}; };
#endif // GEOM_DLGREF_H #endif // GEOM_DLGREF_H

2
src/GEOMToolsGUI/GEOMToolsGUI_1.cxx
View File

@ -168,8 +168,6 @@ void GEOMToolsGUI::OnCheckGeometry()
void GEOMToolsGUI::OnAutoColor() void GEOMToolsGUI::OnAutoColor()
{ {
QList<SALOME_Prs> aListOfGroups;
SALOME_ListIO selected; SALOME_ListIO selected;
SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() ); SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() );
if( !app ) if( !app )

22
src/OBJECT/GEOM_OBJECT_defs.hxx
View File

@ -26,22 +26,14 @@
#ifndef _GEOM_OBJECT_defs_HXX_ #ifndef _GEOM_OBJECT_defs_HXX_
#define _GEOM_OBJECT_defs_HXX_ #define _GEOM_OBJECT_defs_HXX_
#ifdef WNT #ifdef WIN32
#if defined OBJECT_EXPORTS # if defined GEOM_OBJECT_EXPORTS
#if defined WIN32 # define GEOM_OBJECT_EXPORT __declspec( dllexport )
#define GEOM_OBJECT_EXPORT __declspec( dllexport ) # else
#else # define GEOM_OBJECT_EXPORT __declspec( dllimport )
#define GEOM_OBJECT_EXPORT # endif
#endif
#else
#if defined WIN32
#define GEOM_OBJECT_EXPORT __declspec( dllimport )
#else
#define GEOM_OBJECT_EXPORT
#endif
#endif
#else #else
#define GEOM_OBJECT_EXPORT # define GEOM_OBJECT_EXPORT
#endif #endif
#endif #endif

2
src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx
View File

@ -41,7 +41,7 @@
#include <TopTools_IndexedMapOfShape.hxx> #include <TopTools_IndexedMapOfShape.hxx>
#include <GEOMImpl_Types.hxx> #include <GEOMImpl_Types.hxx>
#include <ostream.h> #include <ostream>
//================================================================================= //=================================================================================
// class : PrimitiveGUI_BoxDlg() // class : PrimitiveGUI_BoxDlg()