Windows porting

This commit is contained in:
szy 2005-08-22 11:23:41 +00:00
parent eca46466f2
commit 2907b7dd39
16 changed files with 78 additions and 28 deletions

View File

@ -21,7 +21,13 @@ class QLineEdit;
class QPushButton; class QPushButton;
class QRadioButton; class QRadioButton;
class DlgRef_1Sel1Check1List_QTD : public QWidget #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_1Sel1Check1List_QTD : public QWidget
{ {
Q_OBJECT Q_OBJECT

View File

@ -32,7 +32,13 @@
#include "DlgRef_1Sel5Spin_QTD.h" #include "DlgRef_1Sel5Spin_QTD.h"
#include "DlgRef_SpinBox.h" #include "DlgRef_SpinBox.h"
class DlgRef_1Sel5Spin : public DlgRef_1Sel5Spin_QTD #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_1Sel5Spin : public DlgRef_1Sel5Spin_QTD
{ {
Q_OBJECT Q_OBJECT

View File

@ -31,8 +31,12 @@
#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
class DlgRef_1Spin : public DlgRef_1Spin_QTD #define DLGREF_WNT_EXPORT __declspec( dllexport )
#else
#define DLGREF_WNT_EXPORT
#endif
class DLGREF_WNT_EXPORT DlgRef_1Spin : public DlgRef_1Spin_QTD
{ {
Q_OBJECT Q_OBJECT

View File

@ -17,8 +17,12 @@ class QGridLayout;
class QGroupBox; class QGroupBox;
class QLabel; class QLabel;
class QSpinBox; class QSpinBox;
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
class DlgRef_1Spin_QTD : public QWidget #define DLGREF_WNT_EXPORT __declspec( dllexport )
#else
#define DLGREF_WNT_EXPORT
#endif
class DLGREF_WNT_EXPORT DlgRef_1Spin_QTD : public QWidget
{ {
Q_OBJECT Q_OBJECT

View File

@ -32,7 +32,12 @@
#include "DlgRef_2Sel1Spin2Check_QTD.h" #include "DlgRef_2Sel1Spin2Check_QTD.h"
#include "DlgRef_SpinBox.h" #include "DlgRef_SpinBox.h"
class DlgRef_2Sel1Spin2Check : public DlgRef_2Sel1Spin2Check_QTD #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_2Sel1Spin2Check : public DlgRef_2Sel1Spin2Check_QTD
{ {
Q_OBJECT Q_OBJECT

View File

@ -32,7 +32,13 @@
#include "DlgRef_2Sel3Spin_QTD.h" #include "DlgRef_2Sel3Spin_QTD.h"
#include "DlgRef_SpinBox.h" #include "DlgRef_SpinBox.h"
class DlgRef_2Sel3Spin : public DlgRef_2Sel3Spin_QTD #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_2Sel3Spin : public DlgRef_2Sel3Spin_QTD
{ {
Q_OBJECT Q_OBJECT

View File

@ -19,8 +19,12 @@ class QLabel;
class QLineEdit; class QLineEdit;
class QPushButton; class QPushButton;
class QSpinBox; class QSpinBox;
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
class DlgRef_2Sel3Spin_QTD : public QWidget #define DLGREF_WNT_EXPORT __declspec( dllexport )
#else
#define DLGREF_WNT_EXPORT
#endif
class DLGREF_WNT_EXPORT DlgRef_2Sel3Spin_QTD : public QWidget
{ {
Q_OBJECT Q_OBJECT

View File

@ -31,8 +31,12 @@
#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
class DlgRef_2Spin : public DlgRef_2Spin_QTD #define DLGREF_WNT_EXPORT __declspec( dllexport )
#else
#define DLGREF_WNT_EXPORT
#endif
class DLGREF_WNT_EXPORT DlgRef_2Spin : public DlgRef_2Spin_QTD
{ {
Q_OBJECT Q_OBJECT

View File

@ -17,8 +17,12 @@ class QGridLayout;
class QGroupBox; class QGroupBox;
class QLabel; class QLabel;
class QSpinBox; class QSpinBox;
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
class DlgRef_2Spin_QTD : public QWidget #define DLGREF_WNT_EXPORT __declspec( dllexport )
#else
#define DLGREF_WNT_EXPORT
#endif
class DLGREF_WNT_EXPORT DlgRef_2Spin_QTD : public QWidget
{ {
Q_OBJECT Q_OBJECT

View File

@ -35,12 +35,16 @@
#include <SALOME_ListIO.hxx> #include <SALOME_ListIO.hxx>
#include <CORBA.h> #include <CORBA.h>
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
#define GEOMTOOLSGUI_WNT_EXPORT __declspec( dllexport )
#else
#define GEOMTOOLSGUI_WNT_EXPORT
#endif
//================================================================================= //=================================================================================
// class : GEOMToolsGUI // class : GEOMToolsGUI
// purpose : // purpose :
//================================================================================= //=================================================================================
class GEOMToolsGUI : public GEOMGUI class GEOMTOOLSGUI_WNT_EXPORT GEOMToolsGUI : public GEOMGUI
{ {
public : public :
GEOMToolsGUI( GeometryGUI* ); // hide constructor to avoid direct creation GEOMToolsGUI( GeometryGUI* ); // hide constructor to avoid direct creation

View File

@ -9,8 +9,8 @@
// Module : SALOME // Module : SALOME
// $Header$ // $Header$
#include "GEOMToolsGUI_NameDlg.h"
#include "GEOMToolsGUI_NameDlg.h"
#include <SUIT_Session.h> #include <SUIT_Session.h>
#include <SUIT_Application.h> #include <SUIT_Application.h>
#include <SUIT_Desktop.h> #include <SUIT_Desktop.h>
@ -21,8 +21,8 @@
#include <qlineedit.h> #include <qlineedit.h>
#include <qpushbutton.h> #include <qpushbutton.h>
#include <qlayout.h> #include <qlayout.h>
using namespace std;
//using namespace std;
/*! /*!
Constructor Constructor
*/ */

View File

@ -26,9 +26,8 @@
// Module : GEOM // Module : GEOM
// $Header: // $Header:
using namespace std;
#include "GEOMToolsGUI_NbIsosDlg.h"
#include "GEOMToolsGUI_NbIsosDlg.h"
#include <SUIT_Tools.h> #include <SUIT_Tools.h>
#include <qlabel.h> #include <qlabel.h>
@ -36,6 +35,7 @@ using namespace std;
#include <qgroupbox.h> #include <qgroupbox.h>
#include <qlayout.h> #include <qlayout.h>
#include <qspinbox.h> #include <qspinbox.h>
//using namespace std;
//================================================================================= //=================================================================================
// class : GEOMToolsGUI_NbIsosDlg() // class : GEOMToolsGUI_NbIsosDlg()

View File

@ -25,7 +25,7 @@
// Author : Lucien PIGNOLONI // Author : Lucien PIGNOLONI
// Module : GEOM // Module : GEOM
using namespace std;
#include "GEOMToolsGUI_TransparencyDlg.h" #include "GEOMToolsGUI_TransparencyDlg.h"
#include "GEOMBase.h" #include "GEOMBase.h"
#include "GEOM_AISShape.hxx" #include "GEOM_AISShape.hxx"
@ -62,7 +62,7 @@ using namespace std;
#include <qgroupbox.h> #include <qgroupbox.h>
#include <AIS_InteractiveContext.hxx> #include <AIS_InteractiveContext.hxx>
using namespace std;
//================================================================================= //=================================================================================
// class : GEOMBase_TransparencyDlg() // class : GEOMBase_TransparencyDlg()

View File

@ -30,7 +30,11 @@
#define DIALOGBOX_TRANSPARENCYDLG_H #define DIALOGBOX_TRANSPARENCYDLG_H
#include <qdialog.h> #include <qdialog.h>
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
#define GEOMTOOLSGUI_WNT_EXPORT __declspec( dllexport )
#else
#define GEOMTOOLSGUI_WNT_EXPORT
#endif
class QSlider; class QSlider;
//================================================================================= //=================================================================================
@ -38,7 +42,7 @@ class QSlider;
// purpose : // purpose :
// : WARNING : that is a MODAL dialog. // : WARNING : that is a MODAL dialog.
//================================================================================= //=================================================================================
class GEOMToolsGUI_TransparencyDlg : public QDialog class GEOMTOOLSGUI_WNT_EXPORT GEOMToolsGUI_TransparencyDlg : public QDialog
{ {
Q_OBJECT Q_OBJECT
@ -50,7 +54,7 @@ private :
bool myFirstInit ; /* Inform for the first init */ bool myFirstInit ; /* Inform for the first init */
QSlider* mySlider; QSlider* mySlider;
private slots: private slots:
void ClickOnOk(); void ClickOnOk();
void ClickOnClose(); void ClickOnClose();
void ValueHasChanged( int ) ; void ValueHasChanged( int ) ;

View File

@ -26,7 +26,7 @@
// Module : GEOM // Module : GEOM
// $Header$ // $Header$
using namespace std;
#include "PrimitiveGUI.h" #include "PrimitiveGUI.h"
#include "GeometryGUI.h" #include "GeometryGUI.h"
@ -38,7 +38,7 @@ using namespace std;
#include "PrimitiveGUI_SphereDlg.h" // Method SPHERE #include "PrimitiveGUI_SphereDlg.h" // Method SPHERE
#include "PrimitiveGUI_TorusDlg.h" // Method TORUS #include "PrimitiveGUI_TorusDlg.h" // Method TORUS
#include "PrimitiveGUI_ConeDlg.h" // Method CONE #include "PrimitiveGUI_ConeDlg.h" // Method CONE
using namespace std;
PrimitiveGUI* PrimitiveGUI::myGUIObject = 0; PrimitiveGUI* PrimitiveGUI::myGUIObject = 0;
//======================================================================= //=======================================================================

View File

@ -26,7 +26,6 @@
// Module : GEOM // Module : GEOM
// $Header$ // $Header$
using namespace std;
#include "PrimitiveGUI_SphereDlg.h" #include "PrimitiveGUI_SphereDlg.h"
#include "SUIT_Desktop.h" #include "SUIT_Desktop.h"