Merging with BR_WPdev_For_5_0

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

View File

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

View File

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

View File

@ -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

View File

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