First compiled version of GEOM sources

This commit is contained in:
abd 2006-03-16 11:45:04 +00:00
parent aa00566cfd
commit 5bd9f159c1
154 changed files with 971 additions and 607 deletions

View File

@ -100,9 +100,7 @@ bool BooleanGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent)
//===================================================================================== //=====================================================================================
extern "C" extern "C"
{ {
#ifdef WNT GEOM_BOOLEANGUI_EXPORT
__declspec( dllexport )
#endif
GEOMGUI* GetLibGUI( GeometryGUI* parent ) GEOMGUI* GetLibGUI( GeometryGUI* parent )
{ {
return BooleanGUI::GetBooleanGUI( parent ); return BooleanGUI::GetBooleanGUI( parent );

View File

@ -31,11 +31,29 @@
#include "GEOMGUI.h" #include "GEOMGUI.h"
#ifdef WNT
#if defined BOOLEANGUI_EXPORTS
#if defined WIN32
#define GEOM_BOOLEANGUI_EXPORT __declspec( dllexport )
#else
#define GEOM_BOOLEANGUI_EXPORT
#endif
#else
#if defined WIN32
#define GEOM_BOOLEANGUI_EXPORT __declspec( dllimport )
#else
#define GEOM_BOOLEANGUI_EXPORT
#endif
#endif
#else
#define GEOM_BOOLEANGUI_EXPORT
#endif
//================================================================================= //=================================================================================
// class : BooleanGUI // class : BooleanGUI
// purpose : // purpose :
//================================================================================= //=================================================================================
class BooleanGUI : public GEOMGUI class GEOM_BOOLEANGUI_EXPORT BooleanGUI : public GEOMGUI
{ {
protected: protected:
BooleanGUI( GeometryGUI* parent ); // hide constructor to avoid direct creation BooleanGUI( GeometryGUI* parent ); // hide constructor to avoid direct creation

View File

@ -29,6 +29,8 @@
#ifndef BooleanGUI_Dialog_H #ifndef BooleanGUI_Dialog_H
#define BooleanGUI_Dialog_H #define BooleanGUI_Dialog_H
#include "BooleanGUI.h" //for wnt defines
#include "GEOMBase_Skeleton.h" #include "GEOMBase_Skeleton.h"
class DlgRef_2Sel_QTD; class DlgRef_2Sel_QTD;
@ -37,7 +39,7 @@ class DlgRef_2Sel_QTD;
// class : BooleanGUI_Dialog // class : BooleanGUI_Dialog
// purpose : // purpose :
//================================================================================= //=================================================================================
class BooleanGUI_Dialog : public GEOMBase_Skeleton class GEOM_BOOLEANGUI_EXPORT BooleanGUI_Dialog : public GEOMBase_Skeleton
{ {
Q_OBJECT Q_OBJECT

View File

@ -108,9 +108,7 @@ bool BuildGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
//===================================================================================== //=====================================================================================
extern "C" extern "C"
{ {
#ifdef WNT GEOM_BUILDGUI_EXPORT
__declspec( dllexport )
#endif
GEOMGUI* GetLibGUI( GeometryGUI* parent ) GEOMGUI* GetLibGUI( GeometryGUI* parent )
{ {
return BuildGUI::GetBuildGUI( parent ); return BuildGUI::GetBuildGUI( parent );

View File

@ -29,13 +29,15 @@
#ifndef BUILDGUI_H #ifndef BUILDGUI_H
#define BUILDGUI_H #define BUILDGUI_H
#include "GEOM_BuildGUI.hxx"
#include "GEOMGUI.h" #include "GEOMGUI.h"
//================================================================================= //=================================================================================
// class : BuildGUI // class : BuildGUI
// purpose : // purpose :
//================================================================================= //=================================================================================
class BuildGUI : public GEOMGUI class GEOM_BUILDGUI_EXPORT BuildGUI : public GEOMGUI
{ {
protected: protected:
BuildGUI( GeometryGUI* parent ); // hide constructor to avoid direct creation BuildGUI( GeometryGUI* parent ); // hide constructor to avoid direct creation

View File

@ -29,6 +29,8 @@
#ifndef DIALOGBOX_COMPOUND_H #ifndef DIALOGBOX_COMPOUND_H
#define DIALOGBOX_COMPOUND_H #define DIALOGBOX_COMPOUND_H
#include "GEOM_BuildGUI.hxx"
#include "GEOMBase_Skeleton.h" #include "GEOMBase_Skeleton.h"
#include "DlgRef_1Sel_QTD.h" #include "DlgRef_1Sel_QTD.h"
@ -36,7 +38,7 @@
// class : BuildGUI_CompoundDlg // class : BuildGUI_CompoundDlg
// purpose : // purpose :
//================================================================================= //=================================================================================
class BuildGUI_CompoundDlg : public GEOMBase_Skeleton class GEOM_BUILDGUI_EXPORT BuildGUI_CompoundDlg : public GEOMBase_Skeleton
{ {
Q_OBJECT Q_OBJECT

View File

@ -29,6 +29,8 @@
#ifndef DIALOGBOX_EDGE_H #ifndef DIALOGBOX_EDGE_H
#define DIALOGBOX_EDGE_H #define DIALOGBOX_EDGE_H
#include "GEOM_BuildGUI.hxx"
#include "GEOMBase_Skeleton.h" #include "GEOMBase_Skeleton.h"
#include "DlgRef_2Sel_QTD.h" #include "DlgRef_2Sel_QTD.h"
@ -36,7 +38,7 @@
// class : BuildGUI_EdgeDlg // class : BuildGUI_EdgeDlg
// purpose : // purpose :
//================================================================================= //=================================================================================
class BuildGUI_EdgeDlg : public GEOMBase_Skeleton class GEOM_BUILDGUI_EXPORT BuildGUI_EdgeDlg : public GEOMBase_Skeleton
{ {
Q_OBJECT Q_OBJECT

View File

@ -29,6 +29,8 @@
#ifndef DIALOGBOX_FACE_H #ifndef DIALOGBOX_FACE_H
#define DIALOGBOX_FACE_H #define DIALOGBOX_FACE_H
#include "GEOM_BuildGUI.hxx"
#include "GEOMBase_Skeleton.h" #include "GEOMBase_Skeleton.h"
#include "DlgRef_1Sel1Check_QTD.h" #include "DlgRef_1Sel1Check_QTD.h"
@ -36,7 +38,7 @@
// class : BuildGUI_FaceDlg // class : BuildGUI_FaceDlg
// purpose : // purpose :
//================================================================================= //=================================================================================
class BuildGUI_FaceDlg : public GEOMBase_Skeleton class GEOM_BUILDGUI_EXPORT BuildGUI_FaceDlg : public GEOMBase_Skeleton
{ {
Q_OBJECT Q_OBJECT

View File

@ -29,6 +29,8 @@
#ifndef DIALOGBOX_SHELL_H #ifndef DIALOGBOX_SHELL_H
#define DIALOGBOX_SHELL_H #define DIALOGBOX_SHELL_H
#include "GEOM_BuildGUI.hxx"
#include "GEOMBase_Skeleton.h" #include "GEOMBase_Skeleton.h"
#include "DlgRef_1Sel_QTD.h" #include "DlgRef_1Sel_QTD.h"
@ -36,7 +38,7 @@
// class : BuildGUI_ShellDlg // class : BuildGUI_ShellDlg
// purpose : // purpose :
//================================================================================= //=================================================================================
class BuildGUI_ShellDlg : public GEOMBase_Skeleton class GEOM_BUILDGUI_EXPORT BuildGUI_ShellDlg : public GEOMBase_Skeleton
{ {
Q_OBJECT Q_OBJECT

View File

@ -29,6 +29,8 @@
#ifndef DIALOGBOX_SOLID_H #ifndef DIALOGBOX_SOLID_H
#define DIALOGBOX_SOLID_H #define DIALOGBOX_SOLID_H
#include "GEOM_BuildGUI.hxx"
#include "GEOMBase_Skeleton.h" #include "GEOMBase_Skeleton.h"
#include "DlgRef_1Sel1Check_QTD.h" #include "DlgRef_1Sel1Check_QTD.h"
@ -36,7 +38,7 @@
// class : BuildGUI_SolidDlg // class : BuildGUI_SolidDlg
// purpose : // purpose :
//================================================================================= //=================================================================================
class BuildGUI_SolidDlg : public GEOMBase_Skeleton class GEOM_BUILDGUI_EXPORT BuildGUI_SolidDlg : public GEOMBase_Skeleton
{ {
Q_OBJECT Q_OBJECT

View File

@ -29,6 +29,8 @@
#ifndef DIALOGBOX_WIRE_H #ifndef DIALOGBOX_WIRE_H
#define DIALOGBOX_WIRE_H #define DIALOGBOX_WIRE_H
#include "GEOM_BuildGUI"
#include "GEOMBase_Skeleton.h" #include "GEOMBase_Skeleton.h"
#include "DlgRef_1Sel_QTD.h" #include "DlgRef_1Sel_QTD.h"
@ -36,7 +38,7 @@
// class : BuildGUI_WireDlg // class : BuildGUI_WireDlg
// purpose : // purpose :
//================================================================================= //=================================================================================
class BuildGUI_WireDlg : public GEOMBase_Skeleton class GEOM_BUILDGUI_EXPORT BuildGUI_WireDlg : public GEOMBase_Skeleton
{ {
Q_OBJECT Q_OBJECT

47
src/BuildGUI/GEOM_BuildGUI.hxx Executable file
View File

@ -0,0 +1,47 @@
// 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 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
//
// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
//
//
//
// File : GEOM_BuildGUI.hxx
// Author : Alexander A. BORODIN
// Module : GEOM
#ifndef _GEOM_BuildGUI_HXX_
#define _GEOM_BuildGUI_HXX_
#ifdef WNT
#if defined BUILDGUI_EXPORTS
#if defined WIN32
#define GEOM_BUILDGUI_EXPORT __declspec( dllexport )
#else
#define GEOM_BUILDGUI_EXPORT
#endif
#else
#if defined WIN32
#define GEOM_BUILDGUI_EXPORT __declspec( dllimport )
#else
#define GEOM_BUILDGUI_EXPORT
#endif
#endif
#else
#define GEOM_BUILDGUI_EXPORT
#endif
#endif

View File

@ -54,7 +54,8 @@ LIB_MOC = \
BuildGUI_FaceDlg.h \ BuildGUI_FaceDlg.h \
BuildGUI_ShellDlg.h \ BuildGUI_ShellDlg.h \
BuildGUI_SolidDlg.h \ BuildGUI_SolidDlg.h \
BuildGUI_CompoundDlg.h BuildGUI_CompoundDlg.h \
GEOM_BuildGUI.hxx
LIB_CLIENT_IDL = SALOME_Exception.idl SALOME_GenericObj.idl SALOME_Component.idl LIB_CLIENT_IDL = SALOME_Exception.idl SALOME_GenericObj.idl SALOME_Component.idl

View File

@ -475,9 +475,7 @@ void DisplayGUI::ChangeDisplayMode( const int mode, SUIT_ViewWindow* viewWindow
//===================================================================================== //=====================================================================================
extern "C" extern "C"
{ {
#ifdef WNT GEOM_DISPLAYGUI_EXPORT
__declspec( dllexport )
#endif
GEOMGUI* GetLibGUI( GeometryGUI* parent ) GEOMGUI* GetLibGUI( GeometryGUI* parent )
{ {
return DisplayGUI::GetDisplayGUI( parent ); return DisplayGUI::GetDisplayGUI( parent );

View File

@ -31,15 +31,23 @@
#include "GEOMGUI.h" #include "GEOMGUI.h"
#include "GEOMBase.h" #include "GEOMBase.h"
//#ifdef WNT
//#include <SALOME_WNT.hxx> #ifdef WNT
//#else #if defined DISPLAYGUI_EXPORTS
//#define SALOME_WNT_EXPORT #if defined WIN32
//#endif #define GEOM_DISPLAYGUI_EXPORT __declspec( dllexport )
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS #else
#define DISPLAYGUI_WNT_EXPORT __declspec( dllexport ) #define GEOM_DISPLAYGUI_EXPORT
#endif
#else
#if defined WIN32
#define GEOM_DISPLAYGUI_EXPORT __declspec( dllimport )
#else
#define GEOM_DISPLAYGUI_EXPORT
#endif
#endif
#else #else
#define DISPLAYGUI_WNT_EXPORT #define GEOM_DISPLAYGUI_EXPORT
#endif #endif
//================================================================================= //=================================================================================
// class : GEOMBase_Display // class : GEOMBase_Display
@ -47,7 +55,7 @@
//================================================================================= //=================================================================================
//class QAD_ViewFrame; //class QAD_ViewFrame;
class SUIT_ViewWindow; class SUIT_ViewWindow;
class DisplayGUI : public GEOMGUI class GEOM_DISPLAYGUI_EXPORT DisplayGUI : public GEOMGUI
{ {
protected: protected:
DisplayGUI( GeometryGUI* parent ); // hide constructor to avoid direct creation DisplayGUI( GeometryGUI* parent ); // hide constructor to avoid direct creation

View File

@ -28,6 +28,8 @@
#ifndef DLGREF_1LIST1SPIN1BTN_QTD_H #ifndef DLGREF_1LIST1SPIN1BTN_QTD_H
#define DLGREF_1LIST1SPIN1BTN_QTD_H #define DLGREF_1LIST1SPIN1BTN_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h> #include <qvariant.h>
#include <qwidget.h> #include <qwidget.h>
class QVBoxLayout; class QVBoxLayout;
@ -40,13 +42,7 @@ class QListViewItem;
class QPushButton; class QPushButton;
class QSpinBox; class QSpinBox;
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS class GEOM_DLGREF_EXPORT DlgRef_1List1Spin1Btn_QTD : public QWidget
#define DLGREF_WNT_EXPORT __declspec( dllexport )
#else
#define DLGREF_WNT_EXPORT
#endif
class DLGREF_WNT_EXPORT DlgRef_1List1Spin1Btn_QTD : public QWidget
{ {
Q_OBJECT Q_OBJECT

View File

@ -28,6 +28,8 @@
#ifndef DLGREF_1SEL1CHECK1LIST_QTD_H #ifndef DLGREF_1SEL1CHECK1LIST_QTD_H
#define DLGREF_1SEL1CHECK1LIST_QTD_H #define DLGREF_1SEL1CHECK1LIST_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h> #include <qvariant.h>
#include <qwidget.h> #include <qwidget.h>
class QVBoxLayout; class QVBoxLayout;
@ -40,13 +42,7 @@ class QLineEdit;
class QPushButton; class QPushButton;
class QRadioButton; class QRadioButton;
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS class GEOM_DLGREF_EXPORT DlgRef_1Sel1Check1List_QTD : public QWidget
#define DLGREF_WNT_EXPORT __declspec( dllexport )
#else
#define DLGREF_WNT_EXPORT
#endif
class DLGREF_WNT_EXPORT DlgRef_1Sel1Check1List_QTD : public QWidget
{ {
Q_OBJECT Q_OBJECT

View File

@ -28,6 +28,8 @@
#ifndef DLGREF_1SEL1CHECK_QTD_H #ifndef DLGREF_1SEL1CHECK_QTD_H
#define DLGREF_1SEL1CHECK_QTD_H #define DLGREF_1SEL1CHECK_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h> #include <qvariant.h>
#include <qwidget.h> #include <qwidget.h>
class QVBoxLayout; class QVBoxLayout;
@ -39,13 +41,7 @@ class QLabel;
class QLineEdit; class QLineEdit;
class QPushButton; class QPushButton;
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS class GEOM_DLGREF_EXPORT DlgRef_1Sel1Check_QTD : public QWidget
#define DLGREF_WNT_EXPORT __declspec( dllexport )
#else
#define DLGREF_WNT_EXPORT
#endif
class DLGREF_WNT_EXPORT DlgRef_1Sel1Check_QTD : public QWidget
{ {
Q_OBJECT Q_OBJECT

View File

@ -29,20 +29,12 @@
#ifndef DLGREF_1SEL1SPIN_H #ifndef DLGREF_1SEL1SPIN_H
#define DLGREF_1SEL1SPIN_H #define DLGREF_1SEL1SPIN_H
#include "GEOM_DlgRef.hxx"
#include "DlgRef_1Sel1Spin_QTD.h" #include "DlgRef_1Sel1Spin_QTD.h"
#include "DlgRef_SpinBox.h" #include "DlgRef_SpinBox.h"
//#if defined WNT
//#include <SALOME_WNT.hxx>
//#else
//#define SALOME_WNT_EXPORT
//#endif
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
#define DLGREF_WNT_EXPORT __declspec( dllexport )
#else
#define DLGREF_WNT_EXPORT
#endif
class DLGREF_WNT_EXPORT DlgRef_1Sel1Spin : public DlgRef_1Sel1Spin_QTD class GEOM_DLGREF_EXPORT DlgRef_1Sel1Spin : public DlgRef_1Sel1Spin_QTD
{ {
Q_OBJECT Q_OBJECT

View File

@ -29,16 +29,12 @@
#ifndef DLGREF_1SEL1SPIN1CHECK_H #ifndef DLGREF_1SEL1SPIN1CHECK_H
#define DLGREF_1SEL1SPIN1CHECK_H #define DLGREF_1SEL1SPIN1CHECK_H
#include "GEOM_DlgRef.hxx"
#include "DlgRef_1Sel1Spin1Check_QTD.h" #include "DlgRef_1Sel1Spin1Check_QTD.h"
#include "DlgRef_SpinBox.h" #include "DlgRef_SpinBox.h"
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS class GEOM_DLGREF_EXPORT DlgRef_1Sel1Spin1Check : public DlgRef_1Sel1Spin1Check_QTD
#define DLGREF_WNT_EXPORT __declspec( dllexport )
#else
#define DLGREF_WNT_EXPORT
#endif
class DLGREF_WNT_EXPORT DlgRef_1Sel1Spin1Check : public DlgRef_1Sel1Spin1Check_QTD
{ {
Q_OBJECT Q_OBJECT

View File

@ -28,6 +28,8 @@
#ifndef DLGREF_1SEL1SPIN1CHECK_QTD_H #ifndef DLGREF_1SEL1SPIN1CHECK_QTD_H
#define DLGREF_1SEL1SPIN1CHECK_QTD_H #define DLGREF_1SEL1SPIN1CHECK_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h> #include <qvariant.h>
#include <qwidget.h> #include <qwidget.h>
class QVBoxLayout; class QVBoxLayout;
@ -40,7 +42,7 @@ class QLineEdit;
class QPushButton; class QPushButton;
class QSpinBox; class QSpinBox;
class DlgRef_1Sel1Spin1Check_QTD : public QWidget class GEOM_DLGREF_EXPORT DlgRef_1Sel1Spin1Check_QTD : public QWidget
{ {
Q_OBJECT Q_OBJECT

View File

@ -28,6 +28,8 @@
#ifndef DLGREF_1SEL1SPIN_QTD_H #ifndef DLGREF_1SEL1SPIN_QTD_H
#define DLGREF_1SEL1SPIN_QTD_H #define DLGREF_1SEL1SPIN_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h> #include <qvariant.h>
#include <qwidget.h> #include <qwidget.h>
class QVBoxLayout; class QVBoxLayout;
@ -38,12 +40,8 @@ class QLabel;
class QLineEdit; class QLineEdit;
class QPushButton; class QPushButton;
class QSpinBox; class QSpinBox;
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
#define DLGREF_WNT_EXPORT __declspec( dllexport ) class GEOM_DLGREF_EXPORT DlgRef_1Sel1Spin_QTD : public QWidget
#else
#define DLGREF_WNT_EXPORT
#endif
class DLGREF_WNT_EXPORT DlgRef_1Sel1Spin_QTD : public QWidget
{ {
Q_OBJECT Q_OBJECT

View File

@ -29,10 +29,12 @@
#ifndef DLGREF_1SEL2SPIN_H #ifndef DLGREF_1SEL2SPIN_H
#define DLGREF_1SEL2SPIN_H #define DLGREF_1SEL2SPIN_H
#include "GEOM_DlgRef.hxx"
#include "DlgRef_1Sel2Spin_QTD.h" #include "DlgRef_1Sel2Spin_QTD.h"
#include "DlgRef_SpinBox.h" #include "DlgRef_SpinBox.h"
class DlgRef_1Sel2Spin : public DlgRef_1Sel2Spin_QTD class GEOM_DLGREF_EXPORT DlgRef_1Sel2Spin : public DlgRef_1Sel2Spin_QTD
{ {
Q_OBJECT Q_OBJECT

View File

@ -28,6 +28,8 @@
#ifndef DLGREF_1SEL2SPIN_QTD_H #ifndef DLGREF_1SEL2SPIN_QTD_H
#define DLGREF_1SEL2SPIN_QTD_H #define DLGREF_1SEL2SPIN_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h> #include <qvariant.h>
#include <qwidget.h> #include <qwidget.h>
class QVBoxLayout; class QVBoxLayout;
@ -39,7 +41,7 @@ class QLineEdit;
class QPushButton; class QPushButton;
class QSpinBox; class QSpinBox;
class DlgRef_1Sel2Spin_QTD : public QWidget class GEOM_DLGREF_EXPORT DlgRef_1Sel2Spin_QTD : public QWidget
{ {
Q_OBJECT Q_OBJECT

View File

@ -28,6 +28,8 @@
#ifndef DLGREF_1SEL3CHECK_QTD_H #ifndef DLGREF_1SEL3CHECK_QTD_H
#define DLGREF_1SEL3CHECK_QTD_H #define DLGREF_1SEL3CHECK_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h> #include <qvariant.h>
#include <qwidget.h> #include <qwidget.h>
class QVBoxLayout; class QVBoxLayout;
@ -39,7 +41,7 @@ class QLabel;
class QLineEdit; class QLineEdit;
class QPushButton; class QPushButton;
class DlgRef_1Sel3Check_QTD : public QWidget class GEOM_DLGREF_EXPORT DlgRef_1Sel3Check_QTD : public QWidget
{ {
Q_OBJECT Q_OBJECT

View File

@ -29,21 +29,12 @@
#ifndef DLGREF_1SEL3SPIN_H #ifndef DLGREF_1SEL3SPIN_H
#define DLGREF_1SEL3SPIN_H #define DLGREF_1SEL3SPIN_H
#include "GEOM_DlgRef.hxx"
#include "DlgRef_1Sel3Spin_QTD.h" #include "DlgRef_1Sel3Spin_QTD.h"
#include "DlgRef_SpinBox.h" #include "DlgRef_SpinBox.h"
//#if defined WNT
//#include <SALOME_WNT.hxx>
//#else
//#define SALOME_WNT_EXPORT
//#endif
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS class GEOM_DLGREF_EXPORT DlgRef_1Sel3Spin : public DlgRef_1Sel3Spin_QTD
#define DLGREF_WNT_EXPORT __declspec( dllexport )
#else
#define DLGREF_WNT_EXPORT
#endif
class DLGREF_WNT_EXPORT DlgRef_1Sel3Spin : public DlgRef_1Sel3Spin_QTD
{ {
Q_OBJECT Q_OBJECT

View File

@ -28,6 +28,8 @@
#ifndef DLGREF_1SEL3SPIN_QTD_H #ifndef DLGREF_1SEL3SPIN_QTD_H
#define DLGREF_1SEL3SPIN_QTD_H #define DLGREF_1SEL3SPIN_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h> #include <qvariant.h>
#include <qwidget.h> #include <qwidget.h>
class QVBoxLayout; class QVBoxLayout;
@ -38,12 +40,8 @@ class QLabel;
class QLineEdit; class QLineEdit;
class QPushButton; class QPushButton;
class QSpinBox; class QSpinBox;
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
#define DLGREF_WNT_EXPORT __declspec( dllexport ) class GEOM_DLGREF_EXPORT DlgRef_1Sel3Spin_QTD : public QWidget
#else
#define DLGREF_WNT_EXPORT
#endif
class DLGREF_WNT_EXPORT DlgRef_1Sel3Spin_QTD : public QWidget
{ {
Q_OBJECT Q_OBJECT

View File

@ -29,10 +29,12 @@
#ifndef DLGREF_1SEL4SPIN_H #ifndef DLGREF_1SEL4SPIN_H
#define DLGREF_1SEL4SPIN_H #define DLGREF_1SEL4SPIN_H
#include "GEOM_DlgRef.hxx"
#include "DlgRef_1Sel4Spin_QTD.h" #include "DlgRef_1Sel4Spin_QTD.h"
#include "DlgRef_SpinBox.h" #include "DlgRef_SpinBox.h"
class DlgRef_1Sel4Spin : public DlgRef_1Sel4Spin_QTD class GEOM_DLGREF_EXPORT DlgRef_1Sel4Spin : public DlgRef_1Sel4Spin_QTD
{ {
Q_OBJECT Q_OBJECT

View File

@ -28,6 +28,8 @@
#ifndef DLGREF_1SEL4SPIN_QTD_H #ifndef DLGREF_1SEL4SPIN_QTD_H
#define DLGREF_1SEL4SPIN_QTD_H #define DLGREF_1SEL4SPIN_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h> #include <qvariant.h>
#include <qwidget.h> #include <qwidget.h>
class QVBoxLayout; class QVBoxLayout;
@ -39,7 +41,7 @@ class QLineEdit;
class QPushButton; class QPushButton;
class QSpinBox; class QSpinBox;
class DlgRef_1Sel4Spin_QTD : public QWidget class GEOM_DLGREF_EXPORT DlgRef_1Sel4Spin_QTD : public QWidget
{ {
Q_OBJECT Q_OBJECT

View File

@ -29,16 +29,12 @@
#ifndef DLGREF_1SEL5SPIN_H #ifndef DLGREF_1SEL5SPIN_H
#define DLGREF_1SEL5SPIN_H #define DLGREF_1SEL5SPIN_H
#include "GEOM_DlgRef.hxx"
#include "DlgRef_1Sel5Spin_QTD.h" #include "DlgRef_1Sel5Spin_QTD.h"
#include "DlgRef_SpinBox.h" #include "DlgRef_SpinBox.h"
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS class GEOM_DLGREF_EXPORT DlgRef_1Sel5Spin : public DlgRef_1Sel5Spin_QTD
#define DLGREF_WNT_EXPORT __declspec( dllexport )
#else
#define DLGREF_WNT_EXPORT
#endif
class DLGREF_WNT_EXPORT DlgRef_1Sel5Spin : public DlgRef_1Sel5Spin_QTD
{ {
Q_OBJECT Q_OBJECT

View File

@ -28,6 +28,8 @@
#ifndef DLGREF_1SEL5SPIN_QTD_H #ifndef DLGREF_1SEL5SPIN_QTD_H
#define DLGREF_1SEL5SPIN_QTD_H #define DLGREF_1SEL5SPIN_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h> #include <qvariant.h>
#include <qwidget.h> #include <qwidget.h>
class QVBoxLayout; class QVBoxLayout;
@ -39,7 +41,7 @@ class QLineEdit;
class QPushButton; class QPushButton;
class QSpinBox; class QSpinBox;
class DlgRef_1Sel5Spin_QTD : public QWidget class GEOM_DLGREF_EXPORT DlgRef_1Sel5Spin_QTD : public QWidget
{ {
Q_OBJECT Q_OBJECT

View File

@ -28,17 +28,13 @@
#ifndef DlgRef_1Sel_Ext_H #ifndef DlgRef_1Sel_Ext_H
#define DlgRef_1Sel_Ext_H #define DlgRef_1Sel_Ext_H
#include "GEOM_DlgRef.hxx"
#include "DlgRef_1Sel_QTD.h" #include "DlgRef_1Sel_QTD.h"
class QGridLayout; class QGridLayout;
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS class GEOM_DLGREF_EXPORT DlgRef_1Sel_Ext : public DlgRef_1Sel_QTD
#define DLGREF_WNT_EXPORT __declspec( dllexport )
#else
#define DLGREF_WNT_EXPORT
#endif
class DLGREF_WNT_EXPORT DlgRef_1Sel_Ext : public DlgRef_1Sel_QTD
{ {
Q_OBJECT Q_OBJECT

View File

@ -28,6 +28,8 @@
#ifndef DLGREF_1SEL_QTD_H #ifndef DLGREF_1SEL_QTD_H
#define DLGREF_1SEL_QTD_H #define DLGREF_1SEL_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h> #include <qvariant.h>
#include <qwidget.h> #include <qwidget.h>
class QVBoxLayout; class QVBoxLayout;
@ -38,13 +40,7 @@ class QLabel;
class QLineEdit; class QLineEdit;
class QPushButton; class QPushButton;
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS class GEOM_DLGREF_EXPORT DlgRef_1Sel_QTD : public QWidget
#define DLGREF_WNT_EXPORT __declspec( dllexport )
#else
#define DLGREF_WNT_EXPORT
#endif
class DLGREF_WNT_EXPORT DlgRef_1Sel_QTD : public QWidget
{ {
Q_OBJECT Q_OBJECT

View File

@ -29,14 +29,12 @@
#ifndef DLGREF_1SPIN_H #ifndef DLGREF_1SPIN_H
#define DLGREF_1SPIN_H #define DLGREF_1SPIN_H
#include "GEOM_DlgRef.hxx"
#include "DlgRef_1Spin_QTD.h" #include "DlgRef_1Spin_QTD.h"
#include "DlgRef_SpinBox.h" #include "DlgRef_SpinBox.h"
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
#define DLGREF_WNT_EXPORT __declspec( dllexport ) class GEOM_DLGREF_EXPORT DlgRef_1Spin : public DlgRef_1Spin_QTD
#else
#define DLGREF_WNT_EXPORT
#endif
class DLGREF_WNT_EXPORT DlgRef_1Spin : public DlgRef_1Spin_QTD
{ {
Q_OBJECT Q_OBJECT

View File

@ -28,6 +28,8 @@
#ifndef DLGREF_1SPIN_QTD_H #ifndef DLGREF_1SPIN_QTD_H
#define DLGREF_1SPIN_QTD_H #define DLGREF_1SPIN_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h> #include <qvariant.h>
#include <qwidget.h> #include <qwidget.h>
class QVBoxLayout; class QVBoxLayout;
@ -36,12 +38,8 @@ class QGridLayout;
class QGroupBox; class QGroupBox;
class QLabel; class QLabel;
class QSpinBox; class QSpinBox;
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
#define DLGREF_WNT_EXPORT __declspec( dllexport ) class GEOM_DLGREF_EXPORT DlgRef_1Spin_QTD : public QWidget
#else
#define DLGREF_WNT_EXPORT
#endif
class DLGREF_WNT_EXPORT DlgRef_1Spin_QTD : public QWidget
{ {
Q_OBJECT Q_OBJECT

View File

@ -29,20 +29,12 @@
#ifndef DLGREF_2SEL1SPIN_H #ifndef DLGREF_2SEL1SPIN_H
#define DLGREF_2SEL1SPIN_H #define DLGREF_2SEL1SPIN_H
#include "GEOM_DlgRef.hxx"
#include "DlgRef_2Sel1Spin_QTD.h" #include "DlgRef_2Sel1Spin_QTD.h"
#include "DlgRef_SpinBox.h" #include "DlgRef_SpinBox.h"
//#if defined WNT
//#include <SALOME_WNT.hxx>
//#else
//#define SALOME_WNT_EXPORT
//#endif
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
#define DLGREF_WNT_EXPORT __declspec( dllexport )
#else
#define DLGREF_WNT_EXPORT
#endif
class DLGREF_WNT_EXPORT DlgRef_2Sel1Spin : public DlgRef_2Sel1Spin_QTD class GEOM_DLGREF_EXPORT DlgRef_2Sel1Spin : public DlgRef_2Sel1Spin_QTD
{ {
Q_OBJECT Q_OBJECT

View File

@ -29,15 +29,12 @@
#ifndef DLGREF_2SEL1SPIN2CHECK_H #ifndef DLGREF_2SEL1SPIN2CHECK_H
#define DLGREF_2SEL1SPIN2CHECK_H #define DLGREF_2SEL1SPIN2CHECK_H
#include "GEOM_DlgRef.hxx"
#include "DlgRef_2Sel1Spin2Check_QTD.h" #include "DlgRef_2Sel1Spin2Check_QTD.h"
#include "DlgRef_SpinBox.h" #include "DlgRef_SpinBox.h"
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS class GEOM_DLGREF_EXPORT DlgRef_2Sel1Spin2Check : public DlgRef_2Sel1Spin2Check_QTD
#define DLGREF_WNT_EXPORT __declspec( dllexport )
#else
#define DLGREF_WNT_EXPORT
#endif
class DLGREF_WNT_EXPORT DlgRef_2Sel1Spin2Check : public DlgRef_2Sel1Spin2Check_QTD
{ {
Q_OBJECT Q_OBJECT

View File

@ -28,6 +28,8 @@
#ifndef DLGREF_2SEL1SPIN2CHECK_QTD_H #ifndef DLGREF_2SEL1SPIN2CHECK_QTD_H
#define DLGREF_2SEL1SPIN2CHECK_QTD_H #define DLGREF_2SEL1SPIN2CHECK_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h> #include <qvariant.h>
#include <qwidget.h> #include <qwidget.h>
class QVBoxLayout; class QVBoxLayout;
@ -40,7 +42,7 @@ class QLineEdit;
class QPushButton; class QPushButton;
class QSpinBox; class QSpinBox;
class DlgRef_2Sel1Spin2Check_QTD : public QWidget class GEOM_DLGREF_EXPORT DlgRef_2Sel1Spin2Check_QTD : public QWidget
{ {
Q_OBJECT Q_OBJECT

View File

@ -28,6 +28,8 @@
#ifndef DLGREF_2SEL1SPIN_QTD_H #ifndef DLGREF_2SEL1SPIN_QTD_H
#define DLGREF_2SEL1SPIN_QTD_H #define DLGREF_2SEL1SPIN_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h> #include <qvariant.h>
#include <qwidget.h> #include <qwidget.h>
class QVBoxLayout; class QVBoxLayout;
@ -39,13 +41,7 @@ class QLineEdit;
class QPushButton; class QPushButton;
class QSpinBox; class QSpinBox;
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS class GEOM_DLGREF_EXPORT DlgRef_2Sel1Spin_QTD : public QWidget
#define DLGREF_WNT_EXPORT __declspec( dllexport )
#else
#define DLGREF_WNT_EXPORT
#endif
class DLGREF_WNT_EXPORT DlgRef_2Sel1Spin_QTD : public QWidget
{ {
Q_OBJECT Q_OBJECT

View File

@ -29,19 +29,12 @@
#ifndef DLGREF_2SEL2SPIN_H #ifndef DLGREF_2SEL2SPIN_H
#define DLGREF_2SEL2SPIN_H #define DLGREF_2SEL2SPIN_H
#include "GEOM_DlgRef.hxx"
#include "DlgRef_2Sel2Spin_QTD.h" #include "DlgRef_2Sel2Spin_QTD.h"
#include "DlgRef_SpinBox.h" #include "DlgRef_SpinBox.h"
//#if defined WNT
//#include <SALOME_WNT.hxx> class GEOM_DLGREF_EXPORT DlgRef_2Sel2Spin : public DlgRef_2Sel2Spin_QTD
//#else
//#define SALOME_WNT_EXPORT
//#endif
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
#define DLGREF_WNT_EXPORT __declspec( dllexport )
#else
#define DLGREF_WNT_EXPORT
#endif
class DLGREF_WNT_EXPORT DlgRef_2Sel2Spin : public DlgRef_2Sel2Spin_QTD
{ {
Q_OBJECT Q_OBJECT

View File

@ -29,16 +29,12 @@
#ifndef DLGREF_2SEL2SPIN1CHECK_H #ifndef DLGREF_2SEL2SPIN1CHECK_H
#define DLGREF_2SEL2SPIN1CHECK_H #define DLGREF_2SEL2SPIN1CHECK_H
#include "GEOM_DlgRef.hxx"
#include "DlgRef_2Sel2Spin1Check_QTD.h" #include "DlgRef_2Sel2Spin1Check_QTD.h"
#include "DlgRef_SpinBox.h" #include "DlgRef_SpinBox.h"
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS class GEOM_DLGREF_EXPORT DlgRef_2Sel2Spin1Check : public DlgRef_2Sel2Spin1Check_QTD
#define DLGREF_WNT_EXPORT __declspec( dllexport )
#else
#define DLGREF_WNT_EXPORT
#endif
class DLGREF_WNT_EXPORT DlgRef_2Sel2Spin1Check : public DlgRef_2Sel2Spin1Check_QTD
{ {
Q_OBJECT Q_OBJECT

View File

@ -28,6 +28,8 @@
#ifndef DLGREF_2SEL2SPIN1CHECK_QTD_H #ifndef DLGREF_2SEL2SPIN1CHECK_QTD_H
#define DLGREF_2SEL2SPIN1CHECK_QTD_H #define DLGREF_2SEL2SPIN1CHECK_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h> #include <qvariant.h>
#include <qwidget.h> #include <qwidget.h>
class QVBoxLayout; class QVBoxLayout;
@ -40,7 +42,7 @@ class QLineEdit;
class QPushButton; class QPushButton;
class QSpinBox; class QSpinBox;
class DlgRef_2Sel2Spin1Check_QTD : public QWidget class GEOM_DLGREF_EXPORT DlgRef_2Sel2Spin1Check_QTD : public QWidget
{ {
Q_OBJECT Q_OBJECT

View File

@ -28,6 +28,8 @@
#ifndef DLGREF_2SEL2SPIN_QTD_H #ifndef DLGREF_2SEL2SPIN_QTD_H
#define DLGREF_2SEL2SPIN_QTD_H #define DLGREF_2SEL2SPIN_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h> #include <qvariant.h>
#include <qwidget.h> #include <qwidget.h>
class QVBoxLayout; class QVBoxLayout;
@ -39,13 +41,7 @@ class QLineEdit;
class QPushButton; class QPushButton;
class QSpinBox; class QSpinBox;
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS class GEOM_DLGREF_EXPORT DlgRef_2Sel2Spin_QTD : public QWidget
#define DLGREF_WNT_EXPORT __declspec( dllexport )
#else
#define DLGREF_WNT_EXPORT
#endif
class DLGREF_WNT_EXPORT DlgRef_2Sel2Spin_QTD : public QWidget
{ {
Q_OBJECT Q_OBJECT

View File

@ -29,16 +29,12 @@
#ifndef DLGREF_2SEL3SPIN_H #ifndef DLGREF_2SEL3SPIN_H
#define DLGREF_2SEL3SPIN_H #define DLGREF_2SEL3SPIN_H
#include "GEOM_DlgRef.hxx"
#include "DlgRef_2Sel3Spin_QTD.h" #include "DlgRef_2Sel3Spin_QTD.h"
#include "DlgRef_SpinBox.h" #include "DlgRef_SpinBox.h"
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS class GEOM_DLGREF_EXPORT DlgRef_2Sel3Spin : public DlgRef_2Sel3Spin_QTD
#define DLGREF_WNT_EXPORT __declspec( dllexport )
#else
#define DLGREF_WNT_EXPORT
#endif
class DLGREF_WNT_EXPORT DlgRef_2Sel3Spin : public DlgRef_2Sel3Spin_QTD
{ {
Q_OBJECT Q_OBJECT

View File

@ -28,6 +28,8 @@
#ifndef DLGREF_2SEL3SPIN_QTD_H #ifndef DLGREF_2SEL3SPIN_QTD_H
#define DLGREF_2SEL3SPIN_QTD_H #define DLGREF_2SEL3SPIN_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h> #include <qvariant.h>
#include <qwidget.h> #include <qwidget.h>
class QVBoxLayout; class QVBoxLayout;
@ -38,12 +40,8 @@ class QLabel;
class QLineEdit; class QLineEdit;
class QPushButton; class QPushButton;
class QSpinBox; class QSpinBox;
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
#define DLGREF_WNT_EXPORT __declspec( dllexport ) class GEOM_DLGREF_EXPORT DlgRef_2Sel3Spin_QTD : public QWidget
#else
#define DLGREF_WNT_EXPORT
#endif
class DLGREF_WNT_EXPORT DlgRef_2Sel3Spin_QTD : public QWidget
{ {
Q_OBJECT Q_OBJECT

View File

@ -29,16 +29,13 @@
#ifndef DLGREF_2SEL4SPIN1CHECK_H #ifndef DLGREF_2SEL4SPIN1CHECK_H
#define DLGREF_2SEL4SPIN1CHECK_H #define DLGREF_2SEL4SPIN1CHECK_H
#include "GEOM_DlgRef.hxx"
#include "DlgRef_2Sel4Spin1Check_QTD.h" #include "DlgRef_2Sel4Spin1Check_QTD.h"
#include "DlgRef_SpinBox.h" #include "DlgRef_SpinBox.h"
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
#define DLGREF_WNT_EXPORT __declspec( dllexport )
#else
#define DLGREF_WNT_EXPORT
#endif
class DLGREF_WNT_EXPORT DlgRef_2Sel4Spin1Check : public DlgRef_2Sel4Spin1Check_QTD class GEOM_DLGREF_EXPORT DlgRef_2Sel4Spin1Check : public DlgRef_2Sel4Spin1Check_QTD
{ {
Q_OBJECT Q_OBJECT

View File

@ -28,6 +28,8 @@
#ifndef DLGREF_2SEL4SPIN1CHECK_QTD_H #ifndef DLGREF_2SEL4SPIN1CHECK_QTD_H
#define DLGREF_2SEL4SPIN1CHECK_QTD_H #define DLGREF_2SEL4SPIN1CHECK_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h> #include <qvariant.h>
#include <qwidget.h> #include <qwidget.h>
class QVBoxLayout; class QVBoxLayout;
@ -40,7 +42,7 @@ class QLineEdit;
class QPushButton; class QPushButton;
class QSpinBox; class QSpinBox;
class DlgRef_2Sel4Spin1Check_QTD : public QWidget class GEOM_DLGREF_EXPORT DlgRef_2Sel4Spin1Check_QTD : public QWidget
{ {
Q_OBJECT Q_OBJECT

View File

@ -28,6 +28,8 @@
#ifndef DLGREF_2SEL_QTD_H #ifndef DLGREF_2SEL_QTD_H
#define DLGREF_2SEL_QTD_H #define DLGREF_2SEL_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h> #include <qvariant.h>
#include <qwidget.h> #include <qwidget.h>
class QVBoxLayout; class QVBoxLayout;
@ -38,13 +40,7 @@ class QLabel;
class QLineEdit; class QLineEdit;
class QPushButton; class QPushButton;
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS class GEOM_DLGREF_EXPORT DlgRef_2Sel_QTD : public QWidget
#define DLGREF_WNT_EXPORT __declspec( dllexport )
#else
#define DLGREF_WNT_EXPORT
#endif
class DLGREF_WNT_EXPORT DlgRef_2Sel_QTD : public QWidget
{ {
Q_OBJECT Q_OBJECT

View File

@ -31,12 +31,10 @@
#include "DlgRef_2Spin_QTD.h" #include "DlgRef_2Spin_QTD.h"
#include "DlgRef_SpinBox.h" #include "DlgRef_SpinBox.h"
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
#define DLGREF_WNT_EXPORT __declspec( dllexport ) #include "GEOM_DlgRef.hxx"
#else
#define DLGREF_WNT_EXPORT class GEOM_DLGREF_EXPORT DlgRef_2Spin : public DlgRef_2Spin_QTD
#endif
class DLGREF_WNT_EXPORT DlgRef_2Spin : public DlgRef_2Spin_QTD
{ {
Q_OBJECT Q_OBJECT

View File

@ -28,6 +28,8 @@
#ifndef DLGREF_2SPIN_QTD_H #ifndef DLGREF_2SPIN_QTD_H
#define DLGREF_2SPIN_QTD_H #define DLGREF_2SPIN_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h> #include <qvariant.h>
#include <qwidget.h> #include <qwidget.h>
class QVBoxLayout; class QVBoxLayout;
@ -36,12 +38,8 @@ class QGridLayout;
class QGroupBox; class QGroupBox;
class QLabel; class QLabel;
class QSpinBox; class QSpinBox;
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
#define DLGREF_WNT_EXPORT __declspec( dllexport ) class GEOM_DLGREF_EXPORT DlgRef_2Spin_QTD : public QWidget
#else
#define DLGREF_WNT_EXPORT
#endif
class DLGREF_WNT_EXPORT DlgRef_2Spin_QTD : public QWidget
{ {
Q_OBJECT Q_OBJECT

View File

@ -28,6 +28,8 @@
#ifndef DLGREF_3CHECK_QTD_H #ifndef DLGREF_3CHECK_QTD_H
#define DLGREF_3CHECK_QTD_H #define DLGREF_3CHECK_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h> #include <qvariant.h>
#include <qwidget.h> #include <qwidget.h>
class QVBoxLayout; class QVBoxLayout;
@ -36,13 +38,7 @@ class QGridLayout;
class QButtonGroup; class QButtonGroup;
class QRadioButton; class QRadioButton;
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS class GEOM_DLGREF_EXPORT DlgRef_3Check_QTD : public QWidget
#define DLGREF_WNT_EXPORT __declspec( dllexport )
#else
#define DLGREF_WNT_EXPORT
#endif
class DLGREF_WNT_EXPORT DlgRef_3Check_QTD : public QWidget
{ {
Q_OBJECT Q_OBJECT

View File

@ -29,25 +29,18 @@
#ifndef DlgRef_3SEL_1SPIN_H #ifndef DlgRef_3SEL_1SPIN_H
#define DlgRef_3SEL_1SPIN_H #define DlgRef_3SEL_1SPIN_H
#include "GEOM_DlgRef.hxx"
#include "DlgRef_3Sel_QTD.h" #include "DlgRef_3Sel_QTD.h"
#include "DlgRef_SpinBox.h" #include "DlgRef_SpinBox.h"
#include <qlayout.h> #include <qlayout.h>
#include <qlabel.h> #include <qlabel.h>
//#if defined WNT
//#include <SALOME_WNT.hxx>
//#else
//#define SALOME_WNT_EXPORT
//#endif
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
#define DLGREF_WNT_EXPORT __declspec( dllexport )
#else
#define DLGREF_WNT_EXPORT
#endif
//================================================================================= //=================================================================================
// class : DlgRef_3Sel1Spin // class : DlgRef_3Sel1Spin
// purpose : extension of a DlgRef_3Sel_QTD class, 1 additional spin box is added // purpose : extension of a DlgRef_3Sel_QTD class, 1 additional spin box is added
//================================================================================= //=================================================================================
class DLGREF_WNT_EXPORT DlgRef_3Sel1Spin : public DlgRef_3Sel_QTD class GEOM_DLGREF_EXPORT DlgRef_3Sel1Spin : public DlgRef_3Sel_QTD
{ {
Q_OBJECT Q_OBJECT

View File

@ -29,16 +29,12 @@
#ifndef DLGREF_3SEL3SPIN1CHECK_H #ifndef DLGREF_3SEL3SPIN1CHECK_H
#define DLGREF_3SEL3SPIN1CHECK_H #define DLGREF_3SEL3SPIN1CHECK_H
#include "GEOM_DlgRef.hxx"
#include "DlgRef_3Sel3Spin1Check_QTD.h" #include "DlgRef_3Sel3Spin1Check_QTD.h"
#include "DlgRef_SpinBox.h" #include "DlgRef_SpinBox.h"
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS class GEOM_DLGREF_EXPORT DlgRef_3Sel3Spin1Check : public DlgRef_3Sel3Spin1Check_QTD
#define DLGREF_WNT_EXPORT __declspec( dllexport )
#else
#define DLGREF_WNT_EXPORT
#endif
class DLGREF_WNT_EXPORT DlgRef_3Sel3Spin1Check : public DlgRef_3Sel3Spin1Check_QTD
{ {
Q_OBJECT Q_OBJECT

View File

@ -28,6 +28,8 @@
#ifndef DLGREF_3SEL3SPIN1CHECK_QTD_H #ifndef DLGREF_3SEL3SPIN1CHECK_QTD_H
#define DLGREF_3SEL3SPIN1CHECK_QTD_H #define DLGREF_3SEL3SPIN1CHECK_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h> #include <qvariant.h>
#include <qwidget.h> #include <qwidget.h>
class QVBoxLayout; class QVBoxLayout;
@ -40,7 +42,7 @@ class QLineEdit;
class QPushButton; class QPushButton;
class QSpinBox; class QSpinBox;
class DlgRef_3Sel3Spin1Check_QTD : public QWidget class GEOM_DLGREF_EXPORT DlgRef_3Sel3Spin1Check_QTD : public QWidget
{ {
Q_OBJECT Q_OBJECT

View File

@ -29,16 +29,12 @@
#ifndef DLGREF_3SEL4SPIN2CHECK_H #ifndef DLGREF_3SEL4SPIN2CHECK_H
#define DLGREF_3SEL4SPIN2CHECK_H #define DLGREF_3SEL4SPIN2CHECK_H
#include "GEOM_DlgRef.hxx"
#include "DlgRef_3Sel4Spin2Check_QTD.h" #include "DlgRef_3Sel4Spin2Check_QTD.h"
#include "DlgRef_SpinBox.h" #include "DlgRef_SpinBox.h"
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS class GEOM_DLGREF_EXPORT DlgRef_3Sel4Spin2Check : public DlgRef_3Sel4Spin2Check_QTD
#define DLGREF_WNT_EXPORT __declspec( dllexport )
#else
#define DLGREF_WNT_EXPORT
#endif
class DLGREF_WNT_EXPORT DlgRef_3Sel4Spin2Check : public DlgRef_3Sel4Spin2Check_QTD
{ {
Q_OBJECT Q_OBJECT

View File

@ -28,6 +28,8 @@
#ifndef DLGREF_3SEL4SPIN2CHECK_QTD_H #ifndef DLGREF_3SEL4SPIN2CHECK_QTD_H
#define DLGREF_3SEL4SPIN2CHECK_QTD_H #define DLGREF_3SEL4SPIN2CHECK_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h> #include <qvariant.h>
#include <qwidget.h> #include <qwidget.h>
class QVBoxLayout; class QVBoxLayout;
@ -40,7 +42,7 @@ class QLineEdit;
class QPushButton; class QPushButton;
class QSpinBox; class QSpinBox;
class DlgRef_3Sel4Spin2Check_QTD : public QWidget class GEOM_DLGREF_EXPORT DlgRef_3Sel4Spin2Check_QTD : public QWidget
{ {
Q_OBJECT Q_OBJECT

View File

@ -28,6 +28,8 @@
#ifndef DLGREF_3SEL_QTD_H #ifndef DLGREF_3SEL_QTD_H
#define DLGREF_3SEL_QTD_H #define DLGREF_3SEL_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h> #include <qvariant.h>
#include <qwidget.h> #include <qwidget.h>
class QVBoxLayout; class QVBoxLayout;
@ -38,13 +40,7 @@ class QLabel;
class QLineEdit; class QLineEdit;
class QPushButton; class QPushButton;
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS class GEOM_DLGREF_EXPORT DlgRef_3Sel_QTD : public QWidget
#define DLGREF_WNT_EXPORT __declspec( dllexport )
#else
#define DLGREF_WNT_EXPORT
#endif
class DLGREF_WNT_EXPORT DlgRef_3Sel_QTD : public QWidget
{ {
Q_OBJECT Q_OBJECT

View File

@ -29,19 +29,12 @@
#ifndef DLGREF_3SPIN_H #ifndef DLGREF_3SPIN_H
#define DLGREF_3SPIN_H #define DLGREF_3SPIN_H
#include "GEOM_DlgRef.hxx"
#include "DlgRef_3Spin_QTD.h" #include "DlgRef_3Spin_QTD.h"
#include "DlgRef_SpinBox.h" #include "DlgRef_SpinBox.h"
//#if defined WNT
//#include <SALOME_WNT.hxx> class GEOM_DLGREF_EXPORT DlgRef_3Spin : public DlgRef_3Spin_QTD
//#else
//#define SALOME_WNT_EXPORT
//#endif
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
#define DLGREF_WNT_EXPORT __declspec( dllexport )
#else
#define DLGREF_WNT_EXPORT
#endif
class DLGREF_WNT_EXPORT DlgRef_3Spin : public DlgRef_3Spin_QTD
{ {
Q_OBJECT Q_OBJECT

View File

@ -29,15 +29,12 @@
#ifndef DLGREF_3SPIN1CHECK_H #ifndef DLGREF_3SPIN1CHECK_H
#define DLGREF_3SPIN1CHECK_H #define DLGREF_3SPIN1CHECK_H
#include "GEOM_DlgRef.hxx"
#include "DlgRef_3Spin1Check_QTD.h" #include "DlgRef_3Spin1Check_QTD.h"
#include "DlgRef_SpinBox.h" #include "DlgRef_SpinBox.h"
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS class GEOM_DLGREF_EXPORT DlgRef_3Spin1Check : public DlgRef_3Spin1Check_QTD
#define DLGREF_WNT_EXPORT __declspec( dllexport )
#else
#define DLGREF_WNT_EXPORT
#endif
class DLGREF_WNT_EXPORT DlgRef_3Spin1Check : public DlgRef_3Spin1Check_QTD
{ {
Q_OBJECT Q_OBJECT

View File

@ -28,6 +28,8 @@
#ifndef DLGREF_3SPIN1CHECK_QTD_H #ifndef DLGREF_3SPIN1CHECK_QTD_H
#define DLGREF_3SPIN1CHECK_QTD_H #define DLGREF_3SPIN1CHECK_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h> #include <qvariant.h>
#include <qwidget.h> #include <qwidget.h>
class QVBoxLayout; class QVBoxLayout;
@ -38,13 +40,7 @@ class QLabel;
class QRadioButton; class QRadioButton;
class QSpinBox; class QSpinBox;
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS class GEOM_DLGREF_EXPORT DlgRef_3Spin1Check_QTD : public QWidget
#define DLGREF_WNT_EXPORT __declspec( dllexport )
#else
#define DLGREF_WNT_EXPORT
#endif
class DLGREF_WNT_EXPORT DlgRef_3Spin1Check_QTD : public QWidget
{ {
Q_OBJECT Q_OBJECT

View File

@ -28,6 +28,8 @@
#ifndef DLGREF_3SPIN_QTD_H #ifndef DLGREF_3SPIN_QTD_H
#define DLGREF_3SPIN_QTD_H #define DLGREF_3SPIN_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h> #include <qvariant.h>
#include <qwidget.h> #include <qwidget.h>
class QVBoxLayout; class QVBoxLayout;
@ -37,12 +39,7 @@ class QGroupBox;
class QLabel; class QLabel;
class QSpinBox; class QSpinBox;
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS class GEOM_DLGREF_EXPORT DlgRef_3Spin_QTD : public QWidget
#define DLGREF_WNT_EXPORT __declspec( dllexport )
#else
#define DLGREF_WNT_EXPORT
#endif
class DLGREF_WNT_EXPORT DlgRef_3Spin_QTD : public QWidget
{ {
Q_OBJECT Q_OBJECT

View File

@ -28,6 +28,8 @@
#ifndef DLGREF_4SEL1LIST1CHECK_QTD_H #ifndef DLGREF_4SEL1LIST1CHECK_QTD_H
#define DLGREF_4SEL1LIST1CHECK_QTD_H #define DLGREF_4SEL1LIST1CHECK_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h> #include <qvariant.h>
#include <qwidget.h> #include <qwidget.h>
class QVBoxLayout; class QVBoxLayout;
@ -41,13 +43,7 @@ class QPushButton;
class QCheckBox; class QCheckBox;
class QPushButton; class QPushButton;
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS class GEOM_DLGREF_EXPORT DlgRef_4Sel1List1Check_QTD : public QWidget
#define DLGREF_WNT_EXPORT __declspec( dllexport )
#else
#define DLGREF_WNT_EXPORT
#endif
class DLGREF_WNT_EXPORT DlgRef_4Sel1List1Check_QTD : public QWidget
{ {
Q_OBJECT Q_OBJECT

View File

@ -28,6 +28,8 @@
#ifndef DLGREF_4SEL1LIST_QTD_H #ifndef DLGREF_4SEL1LIST_QTD_H
#define DLGREF_4SEL1LIST_QTD_H #define DLGREF_4SEL1LIST_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h> #include <qvariant.h>
#include <qwidget.h> #include <qwidget.h>
class QVBoxLayout; class QVBoxLayout;
@ -39,7 +41,7 @@ class QLabel;
class QLineEdit; class QLineEdit;
class QPushButton; class QPushButton;
class DlgRef_4Sel1List_QTD : public QWidget class GEOM_DLGREF_EXPORT DlgRef_4Sel1List_QTD : public QWidget
{ {
Q_OBJECT Q_OBJECT

View File

@ -28,6 +28,8 @@
#ifndef DLGREF_6SEL_QTD_H #ifndef DLGREF_6SEL_QTD_H
#define DLGREF_6SEL_QTD_H #define DLGREF_6SEL_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h> #include <qvariant.h>
#include <qwidget.h> #include <qwidget.h>
class QVBoxLayout; class QVBoxLayout;
@ -38,13 +40,7 @@ class QLabel;
class QLineEdit; class QLineEdit;
class QPushButton; class QPushButton;
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS class GEOM_DLGREF_EXPORT DlgRef_6Sel_QTD : public QWidget
#define DLGREF_WNT_EXPORT __declspec( dllexport )
#else
#define DLGREF_WNT_EXPORT
#endif
class DLGREF_WNT_EXPORT DlgRef_6Sel_QTD : public QWidget
{ {
Q_OBJECT Q_OBJECT

View File

@ -28,6 +28,8 @@
#ifndef DLGREF_SKELETON_QTD_H #ifndef DLGREF_SKELETON_QTD_H
#define DLGREF_SKELETON_QTD_H #define DLGREF_SKELETON_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h> #include <qvariant.h>
#include <qdialog.h> #include <qdialog.h>
class QVBoxLayout; class QVBoxLayout;
@ -40,13 +42,7 @@ class QLineEdit;
class QPushButton; class QPushButton;
class QRadioButton; class QRadioButton;
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS class GEOM_DLGREF_EXPORT DlgRef_Skeleton_QTD : public QDialog
#define DLGREF_WNT_EXPORT __declspec( dllexport )
#else
#define DLGREF_WNT_EXPORT
#endif
class DLGREF_WNT_EXPORT DlgRef_Skeleton_QTD : public QDialog
{ {
Q_OBJECT Q_OBJECT

View File

@ -29,22 +29,15 @@
#ifndef GEOMSPINBOX_H #ifndef GEOMSPINBOX_H
#define GEOMSPINBOX_H #define GEOMSPINBOX_H
#include "GEOM_DlgRef.hxx"
#include "QtxDblSpinBox.h" #include "QtxDblSpinBox.h"
//#if defined WNT
//#include <SALOME_WNT.hxx>
//#else
//#define SALOME_WNT_EXPORT
//#endif
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
#define DLGREF_WNT_EXPORT __declspec( dllexport )
#else
#define DLGREF_WNT_EXPORT
#endif
//================================================================================= //=================================================================================
// class : DlgRef_SpinBox // class : DlgRef_SpinBox
// purpose : Derivated from QSpinBox class and modified to accept floats // purpose : Derivated from QSpinBox class and modified to accept floats
//================================================================================= //=================================================================================
class DLGREF_WNT_EXPORT DlgRef_SpinBox : public QtxDblSpinBox class GEOM_DLGREF_EXPORT DlgRef_SpinBox : public QtxDblSpinBox
{ {
Q_OBJECT Q_OBJECT

47
src/DlgRef/GEOM_DlgRef.hxx Executable file
View File

@ -0,0 +1,47 @@
// 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 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
//
// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
//
//
//
// File : GEOM_DlgRef.hxx
// Author : Alexander A. BORODIN
// Module : GEOM
#ifndef _GEOM_DlgRef_HXX_
#define _GEOM_DlgRef_HXX_
#ifdef WNT
#if defined DLGREF_EXPORTS
#if defined WIN32
#define GEOM_DLGREF_EXPORT __declspec( dllexport )
#else
#define GEOM_DLGREF_EXPORT
#endif
#else
#if defined WIN32
#define GEOM_DLGREF_EXPORT __declspec( dllimport )
#else
#define GEOM_DLGREF_EXPORT
#endif
#endif
#else
#define GEOM_OBJECT_EXPORT
#endif
#endif

View File

@ -139,7 +139,8 @@ LIB_MOC = \
DlgRef_3Sel1Spin.h \ DlgRef_3Sel1Spin.h \
DlgRef_1Sel_Ext.h \ DlgRef_1Sel_Ext.h \
DlgRef_3Check_QTD.h \ DlgRef_3Check_QTD.h \
DlgRef_6Sel_QTD.h DlgRef_6Sel_QTD.h \
GEOM_DlgRef.hxx
# header files # header files
EXPORT_HEADERS= $(LIB_MOC) EXPORT_HEADERS= $(LIB_MOC)

View File

@ -669,9 +669,7 @@ bool EntityGUI::OnSubShapeGetSelected(const TopoDS_Shape& ShapeTopo, const char*
//===================================================================================== //=====================================================================================
extern "C" extern "C"
{ {
#ifdef WNT GEOM_ENTITYGUI_EXPORT
__declspec( dllexport )
#endif
GEOMGUI* GetLibGUI( GeometryGUI* parent ) GEOMGUI* GetLibGUI( GeometryGUI* parent )
{ {
return EntityGUI::GetEntityGUI( parent ); return EntityGUI::GetEntityGUI( parent );

View File

@ -29,6 +29,8 @@
#ifndef ENTITYGUI_H #ifndef ENTITYGUI_H
#define ENTITYGUI_H #define ENTITYGUI_H
#include "GEOM_EntityGUI.hxx"
#include "GEOMGUI.h" #include "GEOMGUI.h"
#include "GEOMBase.h" #include "GEOMBase.h"
@ -38,7 +40,7 @@
// class : EntityGUI // class : EntityGUI
// purpose : // purpose :
//================================================================================= //=================================================================================
class EntityGUI : public GEOMGUI class GEOM_ENTITYGUI_EXPORT EntityGUI : public GEOMGUI
{ {
protected: protected:
EntityGUI( GeometryGUI* parent ); // hide constructor to avoid direct creation EntityGUI( GeometryGUI* parent ); // hide constructor to avoid direct creation

View File

@ -28,6 +28,8 @@
#ifndef ENTITYGUI_1SEL_QTD_H #ifndef ENTITYGUI_1SEL_QTD_H
#define ENTITYGUI_1SEL_QTD_H #define ENTITYGUI_1SEL_QTD_H
#include "GEOM_EntityGUI.hxx"
#include <qvariant.h> #include <qvariant.h>
#include <qwidget.h> #include <qwidget.h>
class QVBoxLayout; class QVBoxLayout;
@ -38,7 +40,7 @@ class QLabel;
class QLineEdit; class QLineEdit;
class QPushButton; class QPushButton;
class EntityGUI_1Sel_QTD : public QWidget class GEOM_ENTITYGUI_EXPORT EntityGUI_1Sel_QTD : public QWidget
{ {
Q_OBJECT Q_OBJECT

View File

@ -29,10 +29,12 @@
#ifndef ENTITYGUI_1SPIN_H #ifndef ENTITYGUI_1SPIN_H
#define ENTITYGUI_1SPIN_H #define ENTITYGUI_1SPIN_H
#include "GEOM_EntityGUI.hxx"
#include "EntityGUI_1Spin_QTD.h" #include "EntityGUI_1Spin_QTD.h"
#include "DlgRef_SpinBox.h" #include "DlgRef_SpinBox.h"
class EntityGUI_1Spin : public EntityGUI_1Spin_QTD class GEOM_ENTITYGUI_EXPORT EntityGUI_1Spin : public EntityGUI_1Spin_QTD
{ {
Q_OBJECT Q_OBJECT

View File

@ -28,6 +28,8 @@
#ifndef ENTITYGUI_1SPIN_QTD_H #ifndef ENTITYGUI_1SPIN_QTD_H
#define ENTITYGUI_1SPIN_QTD_H #define ENTITYGUI_1SPIN_QTD_H
#include "GEOM_EntityGUI.hxx"
#include <qvariant.h> #include <qvariant.h>
#include <qwidget.h> #include <qwidget.h>
class QVBoxLayout; class QVBoxLayout;
@ -38,7 +40,7 @@ class QLabel;
class QPushButton; class QPushButton;
class QSpinBox; class QSpinBox;
class EntityGUI_1Spin_QTD : public QWidget class GEOM_ENTITYGUI_EXPORT EntityGUI_1Spin_QTD : public QWidget
{ {
Q_OBJECT Q_OBJECT

View File

@ -29,10 +29,12 @@
#ifndef ENTITYGUI_2SPIN_H #ifndef ENTITYGUI_2SPIN_H
#define ENTITYGUI_2SPIN_H #define ENTITYGUI_2SPIN_H
#include "GEOM_EntityGUI.hxx"
#include "EntityGUI_2Spin_QTD.h" #include "EntityGUI_2Spin_QTD.h"
#include "DlgRef_SpinBox.h" #include "DlgRef_SpinBox.h"
class EntityGUI_2Spin : public EntityGUI_2Spin_QTD class GEOM_ENTITYGUI_EXPORT EntityGUI_2Spin : public EntityGUI_2Spin_QTD
{ {
Q_OBJECT Q_OBJECT

View File

@ -28,6 +28,8 @@
#ifndef ENTITYGUI_2SPIN_QTD_H #ifndef ENTITYGUI_2SPIN_QTD_H
#define ENTITYGUI_2SPIN_QTD_H #define ENTITYGUI_2SPIN_QTD_H
#include "GEOM_EntityGUI.hxx"
#include <qvariant.h> #include <qvariant.h>
#include <qwidget.h> #include <qwidget.h>
class QVBoxLayout; class QVBoxLayout;
@ -38,7 +40,7 @@ class QLabel;
class QPushButton; class QPushButton;
class QSpinBox; class QSpinBox;
class EntityGUI_2Spin_QTD : public QWidget class GEOM_ENTITYGUI_EXPORT EntityGUI_2Spin_QTD : public QWidget
{ {
Q_OBJECT Q_OBJECT

View File

@ -29,10 +29,12 @@
#ifndef ENTITYGUI_3SPIN_H #ifndef ENTITYGUI_3SPIN_H
#define ENTITYGUI_3SPIN_H #define ENTITYGUI_3SPIN_H
#include "GEOM_EntityGUI.hxx"
#include "EntityGUI_3Spin_QTD.h" #include "EntityGUI_3Spin_QTD.h"
#include "DlgRef_SpinBox.h" #include "DlgRef_SpinBox.h"
class EntityGUI_3Spin : public EntityGUI_3Spin_QTD class GEOM_ENTITYGUI_EXPORT EntityGUI_3Spin : public EntityGUI_3Spin_QTD
{ {
Q_OBJECT Q_OBJECT

View File

@ -28,6 +28,8 @@
#ifndef ENTITYGUI_3SPIN_QTD_H #ifndef ENTITYGUI_3SPIN_QTD_H
#define ENTITYGUI_3SPIN_QTD_H #define ENTITYGUI_3SPIN_QTD_H
#include "GEOM_EntityGUI.hxx"
#include <qvariant.h> #include <qvariant.h>
#include <qwidget.h> #include <qwidget.h>
class QVBoxLayout; class QVBoxLayout;
@ -38,7 +40,7 @@ class QLabel;
class QPushButton; class QPushButton;
class QSpinBox; class QSpinBox;
class EntityGUI_3Spin_QTD : public QWidget class GEOM_ENTITYGUI_EXPORT EntityGUI_3Spin_QTD : public QWidget
{ {
Q_OBJECT Q_OBJECT

View File

@ -29,10 +29,12 @@
#ifndef ENTITYGUI_4SPIN_H #ifndef ENTITYGUI_4SPIN_H
#define ENTITYGUI_4SPIN_H #define ENTITYGUI_4SPIN_H
#include "GEOM_EntityGUI.hxx"
#include "EntityGUI_4Spin_QTD.h" #include "EntityGUI_4Spin_QTD.h"
#include "DlgRef_SpinBox.h" #include "DlgRef_SpinBox.h"
class EntityGUI_4Spin : public EntityGUI_4Spin_QTD class GEOM_ENTITYGUI_EXPORT EntityGUI_4Spin : public EntityGUI_4Spin_QTD
{ {
Q_OBJECT Q_OBJECT

View File

@ -28,6 +28,8 @@
#ifndef ENTITYGUI_4SPIN_QTD_H #ifndef ENTITYGUI_4SPIN_QTD_H
#define ENTITYGUI_4SPIN_QTD_H #define ENTITYGUI_4SPIN_QTD_H
#include "GEOM_EntityGUI.hxx"
#include <qvariant.h> #include <qvariant.h>
#include <qwidget.h> #include <qwidget.h>
class QVBoxLayout; class QVBoxLayout;
@ -38,7 +40,7 @@ class QLabel;
class QPushButton; class QPushButton;
class QSpinBox; class QSpinBox;
class EntityGUI_4Spin_QTD : public QWidget class GEOM_ENTITYGUI_EXPORT EntityGUI_4Spin_QTD : public QWidget
{ {
Q_OBJECT Q_OBJECT

View File

@ -28,6 +28,8 @@
#ifndef ENTITYGUI_DIR1_QTD_H #ifndef ENTITYGUI_DIR1_QTD_H
#define ENTITYGUI_DIR1_QTD_H #define ENTITYGUI_DIR1_QTD_H
#include "GEOM_EntityGUI.hxx"
#include <qvariant.h> #include <qvariant.h>
#include <qwidget.h> #include <qwidget.h>
class QVBoxLayout; class QVBoxLayout;
@ -36,7 +38,7 @@ class QGridLayout;
class QButtonGroup; class QButtonGroup;
class QRadioButton; class QRadioButton;
class EntityGUI_Dir1_QTD : public QWidget class GEOM_ENTITYGUI_EXPORT EntityGUI_Dir1_QTD : public QWidget
{ {
Q_OBJECT Q_OBJECT

View File

@ -28,6 +28,8 @@
#ifndef ENTITYGUI_DIR2_QTD_H #ifndef ENTITYGUI_DIR2_QTD_H
#define ENTITYGUI_DIR2_QTD_H #define ENTITYGUI_DIR2_QTD_H
#include "GEOM_EntityGUI.hxx"
#include <qvariant.h> #include <qvariant.h>
#include <qwidget.h> #include <qwidget.h>
class QVBoxLayout; class QVBoxLayout;
@ -36,7 +38,7 @@ class QGridLayout;
class QButtonGroup; class QButtonGroup;
class QRadioButton; class QRadioButton;
class EntityGUI_Dir2_QTD : public QWidget class GEOM_ENTITYGUI_EXPORT EntityGUI_Dir2_QTD : public QWidget
{ {
Q_OBJECT Q_OBJECT

View File

@ -28,6 +28,8 @@
#ifndef ENTITYGUI_POINT_QTD_H #ifndef ENTITYGUI_POINT_QTD_H
#define ENTITYGUI_POINT_QTD_H #define ENTITYGUI_POINT_QTD_H
#include "GEOM_EntityGUI.hxx"
#include <qvariant.h> #include <qvariant.h>
#include <qwidget.h> #include <qwidget.h>
class QVBoxLayout; class QVBoxLayout;
@ -36,7 +38,7 @@ class QGridLayout;
class QButtonGroup; class QButtonGroup;
class QRadioButton; class QRadioButton;
class EntityGUI_Point_QTD : public QWidget class GEOM_ENTITYGUI_EXPORT EntityGUI_Point_QTD : public QWidget
{ {
Q_OBJECT Q_OBJECT

View File

@ -28,6 +28,8 @@
#ifndef ENTITYGUI_SKELETON_QTD_H #ifndef ENTITYGUI_SKELETON_QTD_H
#define ENTITYGUI_SKELETON_QTD_H #define ENTITYGUI_SKELETON_QTD_H
#include "GEOM_EntityGUI.hxx"
#include <qvariant.h> #include <qvariant.h>
#include <qdialog.h> #include <qdialog.h>
class QVBoxLayout; class QVBoxLayout;
@ -38,7 +40,7 @@ class QGroupBox;
class QPushButton; class QPushButton;
class QRadioButton; class QRadioButton;
class EntityGUI_Skeleton_QTD : public QDialog class GEOM_ENTITYGUI_EXPORT EntityGUI_Skeleton_QTD : public QDialog
{ {
Q_OBJECT Q_OBJECT

View File

@ -29,6 +29,8 @@
#ifndef ENTITYGUI_SKETCHERDLG_H #ifndef ENTITYGUI_SKETCHERDLG_H
#define ENTITYGUI_SKETCHERDLG_H #define ENTITYGUI_SKETCHERDLG_H
#include "GEOM_EntityGUI.hxx"
#include "GEOMBase_Helper.h" #include "GEOMBase_Helper.h"
#include "EntityGUI_Skeleton_QTD.h" #include "EntityGUI_Skeleton_QTD.h"
@ -58,7 +60,7 @@
// class : EntityGUI_Dlg // class : EntityGUI_Dlg
// purpose : // purpose :
//================================================================================= //=================================================================================
class EntityGUI_SketcherDlg : public EntityGUI_Skeleton_QTD, public GEOMBase_Helper class GEOM_ENTITYGUI_EXPORT EntityGUI_SketcherDlg : public EntityGUI_Skeleton_QTD, public GEOMBase_Helper
{ {
Q_OBJECT Q_OBJECT

View File

@ -29,6 +29,8 @@
#ifndef DIALOGBOX_SUBSHAPE_H #ifndef DIALOGBOX_SUBSHAPE_H
#define DIALOGBOX_SUBSHAPE_H #define DIALOGBOX_SUBSHAPE_H
#include "GEOM_EntityGUI.hxx"
#include "GEOMBase_Skeleton.h" #include "GEOMBase_Skeleton.h"
#include "DlgRef_1Sel1Check1List_QTD.h" #include "DlgRef_1Sel1Check1List_QTD.h"
@ -37,7 +39,7 @@
// class : EntityGUI_SubShapeDlg // class : EntityGUI_SubShapeDlg
// purpose : // purpose :
//================================================================================= //=================================================================================
class EntityGUI_SubShapeDlg : public GEOMBase_Skeleton class GEOM_ENTITYGUI_EXPORT EntityGUI_SubShapeDlg : public GEOMBase_Skeleton
{ {
Q_OBJECT Q_OBJECT

View File

@ -0,0 +1,47 @@
// 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 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
//
// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
//
//
//
// File : GEOM_EntityGUI.hxx
// Author : Alexander A. BORODIN
// Module : GEOM
#ifndef _GEOM_EntityGUI_HXX_
#define _GEOM_EntityGUI_HXX_
#ifdef WNT
#if defined ENTITYGUI_EXPORTS
#if defined WIN32
#define GEOM_ENTITYGUI_EXPORT __declspec( dllexport )
#else
#define GEOM_ENTITYGUI_EXPORT
#endif
#else
#if defined WIN32
#define GEOM_ENTITYGUI_EXPORT __declspec( dllimport )
#else
#define GEOM_ENTITYGUI_EXPORT
#endif
#endif
#else
#define GEOM_ENTITYGUI_EXPORT
#endif
#endif

View File

@ -38,7 +38,7 @@ VPATH=.:@srcdir@:@top_srcdir@/idl
LIB = libEntityGUI.la LIB = libEntityGUI.la
# header files # header files
EXPORT_HEADERS= EXPORT_HEADERS= GEOM_EntityGUI.hxx
LIB_SRC = EntityGUI.cxx \ LIB_SRC = EntityGUI.cxx \
EntityGUI_Skeleton_QTD.cxx \ EntityGUI_Skeleton_QTD.cxx \

View File

@ -37,6 +37,7 @@ class GEOMAlgo_FinderShapeOnQuad: public GEOMAlgo_FinderShapeOn1
{ {
public: public:
Standard_EXPORT
GEOMAlgo_FinderShapeOnQuad(const gp_Pnt & theTopLeftPoint, GEOMAlgo_FinderShapeOnQuad(const gp_Pnt & theTopLeftPoint,
const gp_Pnt & theTopRigthPoint, const gp_Pnt & theTopRigthPoint,
const gp_Pnt & theBottomLeftPoint, const gp_Pnt & theBottomLeftPoint,

View File

@ -29,6 +29,8 @@
#ifndef GEOMBASE_H #ifndef GEOMBASE_H
#define GEOMBASE_H #define GEOMBASE_H
#include "GEOM_GEOMBase.hxx"
// SALOME Includes // SALOME Includes
#include "GEOM_AISShape.hxx" #include "GEOM_AISShape.hxx"
@ -40,17 +42,6 @@
// QT Includes // QT Includes
#include <qstring.h> #include <qstring.h>
//#if defined WNT
//#include <SALOME_WNT.hxx>
//#else
//#define SALOME_WNT_EXPORT
//#endif
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
#define GEOMBASE_WNT_EXPORT __declspec( dllexport )
#else
#define GEOMBASE_WNT_EXPORT
#endif
class GEOM_Actor; class GEOM_Actor;
class SALOME_ListIO; class SALOME_ListIO;
@ -62,7 +53,7 @@ class QWidget;
// class : GEOMBase // class : GEOMBase
// purpose : // purpose :
//================================================================================= //=================================================================================
class GEOMBASE_WNT_EXPORT GEOMBase class GEOMBASE_EXPORT GEOMBase
{ {
public : public :
GEOMBase(); GEOMBase();

View File

@ -29,6 +29,8 @@
#ifndef GEOMBASE_HELPER_H #ifndef GEOMBASE_HELPER_H
#define GEOMBASE_HELPER_H #define GEOMBASE_HELPER_H
#include "GEOM_GEOMBase.hxx"
#include "GEOM_Displayer.h" #include "GEOM_Displayer.h"
#include "SALOME_Prs.h" #include "SALOME_Prs.h"
#include "SALOME_ListIO.hxx" #include "SALOME_ListIO.hxx"
@ -38,16 +40,7 @@
#include <qstring.h> #include <qstring.h>
#include <list> #include <list>
//#if defined WNT
//#include <SALOME_WNT.hxx>
//#else
//#define SALOME_WNT_EXPORT
//#endif
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
#define GEOMBASE_WNT_EXPORT __declspec( dllexport )
#else
#define GEOMBASE_WNT_EXPORT
#endif
typedef std::list<GEOM::GEOM_Object_ptr> ObjectList; typedef std::list<GEOM::GEOM_Object_ptr> ObjectList;
class SalomeApp_Study; class SalomeApp_Study;
@ -64,7 +57,7 @@ class TColStd_MapOfInteger;
// performing common operations (display/erase, selection activation, // performing common operations (display/erase, selection activation,
// publication in a study, transaction management) // publication in a study, transaction management)
//================================================================ //================================================================
class GEOMBASE_WNT_EXPORT GEOMBase_Helper class GEOMBASE_EXPORT GEOMBase_Helper
{ {
public: public:
GEOMBase_Helper( SUIT_Desktop* ); GEOMBase_Helper( SUIT_Desktop* );

View File

@ -29,6 +29,8 @@
#ifndef GEOMBASE_SKELETON_H #ifndef GEOMBASE_SKELETON_H
#define GEOMBASE_SKELETON_H #define GEOMBASE_SKELETON_H
#include "GEOM_GEOMBase.hxx"
#include "DlgRef_Skeleton_QTD.h" #include "DlgRef_Skeleton_QTD.h"
#include "GEOMBase.h" #include "GEOMBase.h"
@ -42,18 +44,8 @@
#include <qpushbutton.h> #include <qpushbutton.h>
#include <qradiobutton.h> #include <qradiobutton.h>
#include <qbuttongroup.h> #include <qbuttongroup.h>
//#if defined WNT
//#include <SALOME_WNT.hxx>
//#else
//#define SALOME_WNT_EXPORT
//#endif
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
#define GEOMBASE_WNT_EXPORT __declspec( dllexport )
#else
#define GEOMBASE_WNT_EXPORT
#endif
class GEOMBASE_WNT_EXPORT GEOMBase_Skeleton : public DlgRef_Skeleton_QTD, public GEOMBase_Helper class GEOMBASE_EXPORT GEOMBase_Skeleton : public DlgRef_Skeleton_QTD, public GEOMBase_Helper
{ {
Q_OBJECT Q_OBJECT

View File

@ -29,6 +29,8 @@
#ifndef GEOMBase_aParameterDLG_H #ifndef GEOMBase_aParameterDLG_H
#define GEOMBase_aParameterDLG_H #define GEOMBase_aParameterDLG_H
#include "GEOM_GEOMBase.hxx"
#include <qdialog.h> #include <qdialog.h>
class QPushButton; class QPushButton;
@ -38,7 +40,7 @@ class QtxDblSpinBox;
// class : GEOMBase_aParameterDlg // class : GEOMBase_aParameterDlg
// purpose : // purpose :
//================================================================================= //=================================================================================
class GEOMBase_aParameterDlg : public QDialog class GEOMBASE_EXPORT GEOMBase_aParameterDlg : public QDialog
{ {
Q_OBJECT Q_OBJECT

47
src/GEOMBase/GEOM_GEOMBase.hxx Executable file
View File

@ -0,0 +1,47 @@
// 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 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
//
// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
//
//
//
// File : GEOM_GEOMBase.hxx
// Author : Alexander A. BORODIN
// Module : GEOM
#ifndef _GEOM_GEOMBase_HXX_
#define _GEOM_GEOMBase_HXX_
#ifdef WNT
#if defined GEOMBASE_EXPORTS
#if defined WIN32
#define GEOMBASE_EXPORT __declspec( dllexport )
#else
#define GEOMBASE_EXPORT
#endif
#else
#if defined WIN32
#define GEOMBASE_EXPORT __declspec( dllimport )
#else
#define GEOMBASE_EXPORT
#endif
#endif
#else
#define GEOMBASE_EXPORT
#endif
#endif

View File

@ -29,13 +29,14 @@
#ifndef GEOM_OPERATION_H #ifndef GEOM_OPERATION_H
#define GEOM_OPERATION_H #define GEOM_OPERATION_H
#include "GEOM_GEOMBase.hxx"
#include "SUIT_Operation.h" #include "SUIT_Operation.h"
#include <SALOMEconfig.h> #include <SALOMEconfig.h>
#include <Standard_Macro.hxx>
#include CORBA_CLIENT_HEADER(GEOM_Gen) #include CORBA_CLIENT_HEADER(GEOM_Gen)
class Standard_EXPORT GEOM_Operation : public SUIT_Operation class GEOMBASE_EXPORT GEOM_Operation : public SUIT_Operation
{ {
public: public:
GEOM_Operation( SUIT_Application*, GEOM::GEOM_IOperations_ptr ); GEOM_Operation( SUIT_Application*, GEOM::GEOM_IOperations_ptr );

View File

@ -51,16 +51,29 @@ class TopoDS_Shape;
#ifndef _Standard_Macro_HeaderFile #ifndef _Standard_Macro_HeaderFile
#include <Standard_Macro.hxx> #include <Standard_Macro.hxx>
#endif #endif
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
#define GEOMCLIENT_WNT_EXPORT __declspec( dllexport ) #ifdef WNT
#if defined GEOMCLIENT_EXPORTS
#if defined WIN32
#define GEOMCLIENT_EXPORT __declspec( dllexport )
#else
#define GEOMCLIENT_EXPORT
#endif
#else
#if defined WIN32
#define GEOMCLIENT_EXPORT __declspec( dllimport )
#else
#define GEOMCLIENT_EXPORT
#endif
#endif
#else #else
#define GEOMCLIENT_WNT_EXPORT #define GEOMCLIENT_EXPORT
#endif #endif
//===================================================================== //=====================================================================
// GEOM_Client : class definition // GEOM_Client : class definition
//===================================================================== //=====================================================================
class GEOMCLIENT_WNT_EXPORT GEOM_Client { class GEOMCLIENT_EXPORT GEOM_Client {
public: public:

View File

@ -34,11 +34,29 @@
#include <OSD_SharedLibrary.hxx> #include <OSD_SharedLibrary.hxx>
#include <qapplication.h> #include <qapplication.h>
#ifdef WNT
#if defined GEOMCONTEXT_EXPORTS
#if defined WIN32
#define GEOM_CONTEXT_EXPORT __declspec( dllexport )
#else
#define GEOM_CONTEXT_EXPORT
#endif
#else
#if defined WIN32
#define GEOM_CONTEXT_EXPORT __declspec( dllimport )
#else
#define GEOM_CONTEXT_EXPORT
#endif
#endif
#else
#define GEOM_CONTEXT_EXPORT
#endif
//================================================================================= //=================================================================================
// class : GEOMContext // class : GEOMContext
// purpose : // purpose :
//================================================================================= //=================================================================================
class GEOMContext : public QObject class GEOM_CONTEXT_EXPORT GEOMContext : public QObject
{ {
Q_OBJECT /* for QT compatibility */ Q_OBJECT /* for QT compatibility */

View File

@ -29,6 +29,8 @@
#if !defined( __GEOMGUI_H ) #if !defined( __GEOMGUI_H )
#define __GEOMGUI_H #define __GEOMGUI_H
#include "GEOM_GEOMGUI.hxx"
#include <qobject.h> #include <qobject.h>
class SUIT_Desktop; class SUIT_Desktop;
@ -37,21 +39,11 @@ class QMouseEvent;
class QKeyEvent; class QKeyEvent;
class GeometryGUI; class GeometryGUI;
//#ifdef WNT
//#include <SALOME_WNT.hxx>
//#else
//#define SALOME_WNT_EXPORT
//#endif
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
#define GEOMGUI_WNT_EXPORT __declspec( dllexport )
#else
#define GEOMGUI_WNT_EXPORT
#endif
//================================================================================= //=================================================================================
// class : GEOMGUI // class : GEOMGUI
// purpose : Base class for all geometry GUI subclasses // purpose : Base class for all geometry GUI subclasses
//================================================================================= //=================================================================================
class GEOMGUI_WNT_EXPORT GEOMGUI : public QObject class GEOMGUI_EXPORT GEOMGUI : public QObject
{ {
public : public :
// Constructor // Constructor

View File

@ -20,9 +20,11 @@
#ifndef GEOMGUI_OCCSELECTOR_H #ifndef GEOMGUI_OCCSELECTOR_H
#define GEOMGUI_OCCSELECTOR_H #define GEOMGUI_OCCSELECTOR_H
#include "GEOM_GEOMGUI.hxx"
#include <LightApp_OCCSelector.h> #include <LightApp_OCCSelector.h>
class GEOMGUI_OCCSelector : public LightApp_OCCSelector class GEOMGUI_EXPORT GEOMGUI_OCCSelector : public LightApp_OCCSelector
{ {
public: public:
GEOMGUI_OCCSelector( OCCViewer_Viewer*, SUIT_SelectionMgr* ); GEOMGUI_OCCSelector( OCCViewer_Viewer*, SUIT_SelectionMgr* );

View File

@ -29,12 +29,14 @@
#ifndef GEOMGUI_SELECTION_HeaderFile #ifndef GEOMGUI_SELECTION_HeaderFile
#define GEOMGUI_SELECTION_HeaderFile #define GEOMGUI_SELECTION_HeaderFile
#include "GEOM_GEOMGUI.hxx"
#include <LightApp_Selection.h> #include <LightApp_Selection.h>
#include <SALOMEconfig.h> #include <SALOMEconfig.h>
#include CORBA_SERVER_HEADER(GEOM_Gen) #include CORBA_SERVER_HEADER(GEOM_Gen)
class GEOMGUI_Selection : public LightApp_Selection class GEOMGUI_EXPORT GEOMGUI_Selection : public LightApp_Selection
{ {
public: public:
GEOMGUI_Selection(); GEOMGUI_Selection();

View File

@ -29,6 +29,8 @@
#if !defined (__GEOM_DISPLAYER_H) #if !defined (__GEOM_DISPLAYER_H)
#define __GEOM_DISPLAYER_H #define __GEOM_DISPLAYER_H
#include "GEOM_GEOMGUI.hxx"
#include "SALOME_Prs.h" #include "SALOME_Prs.h"
#include "SALOME_InteractiveObject.hxx" #include "SALOME_InteractiveObject.hxx"
#include "SALOME_ListIO.hxx" #include "SALOME_ListIO.hxx"
@ -55,18 +57,7 @@ class SalomeApp_Application;
class SUIT_SelectionFilter; class SUIT_SelectionFilter;
//class SALOME_Selection; //class SALOME_Selection;
//#ifdef WNT class GEOMGUI_EXPORT GEOM_Displayer : public LightApp_Displayer
//#include <SALOME_WNT.hxx>
//#else
//#define SALOME_WNT_EXPORT
//#endif
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
#define GEOMGUI_WNT_EXPORT __declspec( dllexport )
#else
#define GEOMGUI_WNT_EXPORT
#endif
class GEOMGUI_WNT_EXPORT GEOM_Displayer : public LightApp_Displayer
{ {
public: public:

Some files were not shown because too many files have changed in this diff Show More