]> SALOME platform Git repositories - modules/gui.git/commitdiff
Salome HOME
Porting to win32 system.
authornds <nds@opencascade.com>
Wed, 28 May 2008 07:58:22 +0000 (07:58 +0000)
committernds <nds@opencascade.com>
Wed, 28 May 2008 07:58:22 +0000 (07:58 +0000)
12 files changed:
SUIT.pro
src/HTMLService/HTMLService.pro
src/HTMLService/HTMLService_HTML.hxx
src/HTMLService/HTMLService_HTMLImage.hxx
src/HTMLService/HTMLService_HTMLParagraph.hxx
src/HTMLService/HTMLService_HTMLTable.hxx
src/HTMLService/HTMLService_HTMLTableCell.hxx
src/HTMLService/HTMLService_HTMLTableRow.hxx
src/HTMLService/HTMLService_HTMLText.hxx
src/LogWindow/LogWindow.pro
src/OBJECT/OBJECT.pro
src/ObjBrowser/ObjBrowser.pro

index f6ce446371b1f7ce121adc99ff68e03364459c30..76ca8e837117792652995daeaea619b1e236892a 100644 (file)
--- a/SUIT.pro
+++ b/SUIT.pro
@@ -1,6 +1,10 @@
-TEMPLATE = subdirs
+unix:TEMPLATE = subdirs
+win32:TEMPLATE = vcsubdirs
+
 CONFIG += ordered
 
+win32:CONFIG += embed_manifest_exe
+
 SUBDIRS = src/Qtx \
           src/Style \
          src/ObjBrowser \
index 54a1af46c9c52b874bf517cc7e49e2bf3e9f9019..ea2dad205469af0963dd1684bf05c4a47a76bd59 100755 (executable)
@@ -1,4 +1,5 @@
-TEMPLATE = lib
+unix:TEMPLATE = lib
+win32:TEMPLATE = vclib
 
 DESTDIR = ../../$(CONFIG_ID)/lib
 MOC_DIR = ../../moc
@@ -16,7 +17,13 @@ LIBS += -L../../$(CONFIG_ID)/lib $${CAS_KERNEL} $${CAS_VIEWER}
 CONFIG -= debug release debug_and_release
 CONFIG += qt thread debug dll shared
 
-win32:DEFINES += WIN32 
+win32:copy_hdr.name = Install ${QMAKE_FILE_IN}
+win32:copy_hdr.commands = type ${QMAKE_FILE_IN} > ../../include/${QMAKE_FILE_BASE}.hxx
+win32:copy_hdr.output = ../../include/${QMAKE_FILE_BASE}.hxx
+win32:copy_hdr.input = HEADERS
+win32:QMAKE_EXTRA_COMPILERS += copy_hdr
+
+win32:DEFINES += WNT WIN32 
 DEFINES += HTMLSERVICE_EXPORTS $(CASDEFINES) OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS
 
 HEADERS  = *.hxx
index 083e6ef0cc816550d5c72bc4d86a6c2e26581b71..d5d174826052cc07ff02ca7b00520df83ddd871f 100755 (executable)
@@ -1,84 +1,84 @@
-// File:      HTMLService_HTML.hxx\r
-// Created:   12.10.2006\r
-// Author:    Sergey TELKOV\r
-// Copyright (C) AREVA NP 2006\r
-\r
-#ifndef HTMLSERVICE_HTML_H\r
-#define HTMLSERVICE_HTML_H\r
-\r
-#include <HTMLService.hxx>\r
-\r
-#include <MMgt_TShared.hxx>\r
-#include <Standard_DefineHandle.hxx>\r
-\r
-#include <NCollection_Sequence.hxx>\r
-#include <TCollection_ExtendedString.hxx>\r
-\r
-class Quantity_Color;\r
-class Handle(HTMLService_HTML);\r
-\r
-typedef NCollection_Sequence<TCollection_ExtendedString> SequenceOfHTMLLine;\r
-\r
-/*!\r
-  Class HTMLService_HTML. Base class for HTML generation.\r
-*/\r
-\r
-class HTMLSERVICE_EXPORT HTMLService_HTML : public MMgt_TShared\r
-{\r
-public:\r
-  enum { Left = 0x01, Right = 0x02, Center = 0x04,\r
-         Top = 0x08, Bottom = 0x10, Middle = 0x20,\r
-         HAlignment = Left | Right | Center, VAlignment = Top | Bottom | Middle } AlignmentFlags;\r
-\r
-public:\r
-  Standard_EXPORT HTMLService_HTML();\r
-  Standard_EXPORT HTMLService_HTML( const Handle(HTMLService_HTML)& );\r
-  Standard_EXPORT ~HTMLService_HTML();\r
-\r
-  Standard_EXPORT TCollection_ExtendedString GetTitle() const;\r
-  Standard_EXPORT void                       SetTitle( const TCollection_ExtendedString& );\r
-\r
-  Standard_EXPORT Standard_Boolean   GenerateFile( const TCollection_ExtendedString&,\r
-                                                   const Standard_Boolean = Standard_False ) const;\r
-  Standard_EXPORT SequenceOfHTMLLine GenerateText( const Standard_Boolean = Standard_False ) const;\r
-\r
-  Standard_EXPORT static TCollection_ExtendedString ColorString( const Quantity_Color& );\r
-  Standard_EXPORT static TCollection_ExtendedString AlignString( const Standard_Integer );\r
-\r
-  Standard_EXPORT Standard_Boolean   IsVisible() const;\r
-  Standard_EXPORT void               SetVisible( const Standard_Boolean );\r
-\r
-protected:\r
-  Standard_EXPORT virtual void       Generate( SequenceOfHTMLLine& ) const = 0;\r
-  Standard_EXPORT virtual void       SubItemsHTML( SequenceOfHTMLLine& ) const;\r
-\r
-  Standard_EXPORT TCollection_ExtendedString EncloseToTag( const TCollection_ExtendedString&, const TCollection_ExtendedString&,\r
-                                                           const TCollection_ExtendedString& = TCollection_ExtendedString() ) const;\r
-\r
-  Standard_EXPORT void               ClearSubItems();\r
-  Standard_EXPORT void               InsertSubItem( const Handle(HTMLService_HTML)& );\r
-  Standard_EXPORT void               RemoveSubItem( const Handle(HTMLService_HTML)& );\r
-\r
-  void                               AppendIndent( SequenceOfHTMLLine& ) const;\r
-  void                               AppendIndent( TCollection_ExtendedString& ) const;\r
-  void                               Concatenate( SequenceOfHTMLLine&, const SequenceOfHTMLLine& ) const;\r
-\r
-private:\r
-  void                               BeginDocument( SequenceOfHTMLLine& ) const;\r
-  void                               EndDocument( SequenceOfHTMLLine& ) const;\r
-\r
-private:\r
-  typedef NCollection_Sequence<Handle(HTMLService_HTML)> HTMLSequence;\r
-\r
-private:\r
-  TCollection_ExtendedString         myTitle;\r
-  Standard_Boolean                   myVisible;\r
-  HTMLSequence                       mySubItems;\r
-\r
-public:\r
-  DEFINE_STANDARD_RTTI(HTMLService_HTML)\r
-};\r
-\r
-DEFINE_STANDARD_HANDLE(HTMLService_HTML, MMgt_TShared)\r
-\r
-#endif\r
+// File:      HTMLService_HTML.hxx
+// Created:   12.10.2006
+// Author:    Sergey TELKOV
+// Copyright (C) AREVA NP 2006
+
+#ifndef HTMLSERVICE_HTML_H
+#define HTMLSERVICE_HTML_H
+
+#include <HTMLService.hxx>
+
+#include <MMgt_TShared.hxx>
+#include <Standard_DefineHandle.hxx>
+
+#include <NCollection_Sequence.hxx>
+#include <TCollection_ExtendedString.hxx>
+
+class Quantity_Color;
+class Handle(HTMLService_HTML);
+
+typedef NCollection_Sequence<TCollection_ExtendedString> SequenceOfHTMLLine;
+
+/*!
+  Class HTMLService_HTML. Base class for HTML generation.
+*/
+
+class HTMLService_HTML : public MMgt_TShared
+{
+public:
+  enum { Left = 0x01, Right = 0x02, Center = 0x04,
+         Top = 0x08, Bottom = 0x10, Middle = 0x20,
+         HAlignment = Left | Right | Center, VAlignment = Top | Bottom | Middle } AlignmentFlags;
+
+public:
+  Standard_EXPORT HTMLService_HTML();
+  Standard_EXPORT HTMLService_HTML( const Handle(HTMLService_HTML)& );
+  Standard_EXPORT ~HTMLService_HTML();
+
+  Standard_EXPORT TCollection_ExtendedString GetTitle() const;
+  Standard_EXPORT void                       SetTitle( const TCollection_ExtendedString& );
+
+  Standard_EXPORT Standard_Boolean   GenerateFile( const TCollection_ExtendedString&,
+                                                   const Standard_Boolean = Standard_False ) const;
+  Standard_EXPORT SequenceOfHTMLLine GenerateText( const Standard_Boolean = Standard_False ) const;
+
+  Standard_EXPORT static TCollection_ExtendedString ColorString( const Quantity_Color& );
+  Standard_EXPORT static TCollection_ExtendedString AlignString( const Standard_Integer );
+
+  Standard_EXPORT Standard_Boolean   IsVisible() const;
+  Standard_EXPORT void               SetVisible( const Standard_Boolean );
+
+protected:
+  Standard_EXPORT virtual void       Generate( SequenceOfHTMLLine& ) const = 0;
+  Standard_EXPORT virtual void       SubItemsHTML( SequenceOfHTMLLine& ) const;
+
+  Standard_EXPORT TCollection_ExtendedString EncloseToTag( const TCollection_ExtendedString&, const TCollection_ExtendedString&,
+                                                           const TCollection_ExtendedString& = TCollection_ExtendedString() ) const;
+
+  Standard_EXPORT void               ClearSubItems();
+  Standard_EXPORT void               InsertSubItem( const Handle(HTMLService_HTML)& );
+  Standard_EXPORT void               RemoveSubItem( const Handle(HTMLService_HTML)& );
+
+  void                               AppendIndent( SequenceOfHTMLLine& ) const;
+  void                               AppendIndent( TCollection_ExtendedString& ) const;
+  void                               Concatenate( SequenceOfHTMLLine&, const SequenceOfHTMLLine& ) const;
+
+private:
+  void                               BeginDocument( SequenceOfHTMLLine& ) const;
+  void                               EndDocument( SequenceOfHTMLLine& ) const;
+
+private:
+  typedef NCollection_Sequence<Handle(HTMLService_HTML)> HTMLSequence;
+
+private:
+  TCollection_ExtendedString         myTitle;
+  Standard_Boolean                   myVisible;
+  HTMLSequence                       mySubItems;
+
+public:
+  DEFINE_STANDARD_RTTI(HTMLService_HTML)
+};
+
+DEFINE_STANDARD_HANDLE(HTMLService_HTML, MMgt_TShared)
+
+#endif
index 95bae3c1d4b6725fd857a12311fe3550646bcdcb..ba91de642e74fc2b23c835292b4e0a85f56c88b2 100755 (executable)
@@ -1,60 +1,60 @@
-// File:      HTMLService_HTMLImage.hxx\r
-// Created:   13.10.2006\r
-// Author:    Sergey TELKOV\r
-// Copyright (C) AREVA NP 2006\r
-\r
-#ifndef HTMLSERVICE_HTMLIMAGE_H\r
-#define HTMLSERVICE_HTMLIMAGE_H\r
-\r
-#include <HTMLService.hxx>\r
-#include <HTMLService_HTML.hxx>\r
-\r
-#include <Quantity_Color.hxx>\r
-\r
-/*!\r
-  Class HTMLService_HTMLImage. Generator of the HTML image.\r
-*/\r
-\r
-class HTMLSERVICE_EXPORT HTMLService_HTMLImage : public HTMLService_HTML\r
-{\r
-public:\r
-  enum { SP_Unknown, SP_File, SP_HTTP, SP_FTP } SourceProtocol;\r
-\r
-public:\r
-  Standard_EXPORT HTMLService_HTMLImage( const TCollection_ExtendedString& = TCollection_ExtendedString() );\r
-  Standard_EXPORT HTMLService_HTMLImage( const Handle(HTMLService_HTML)&,\r
-                                      const TCollection_ExtendedString& = TCollection_ExtendedString() );\r
-  Standard_EXPORT virtual ~HTMLService_HTMLImage();\r
-\r
-  Standard_EXPORT Standard_Integer           GetWidth() const;\r
-  Standard_EXPORT Standard_Integer           GetHeight() const;\r
-  Standard_EXPORT TCollection_ExtendedString GetSource() const;\r
-  Standard_EXPORT Standard_Integer           GetAlignment() const;\r
-  Standard_EXPORT Standard_Integer           GetSourceProtocol() const;\r
-\r
-  Standard_EXPORT void                       SetWidth( const Standard_Integer );\r
-  Standard_EXPORT void                       SetHeight( const Standard_Integer );\r
-  Standard_EXPORT void                       SetAlignment( const Standard_Integer );\r
-  Standard_EXPORT void                       SetSource( const TCollection_ExtendedString& );\r
-  Standard_EXPORT void                       SetSourceProtocol( const Standard_Integer& );\r
-\r
-protected:\r
-  Standard_EXPORT virtual void               Generate( SequenceOfHTMLLine& ) const;\r
-\r
-private:\r
-  TCollection_ExtendedString                 SourcePrefix() const;\r
-\r
-private:\r
-  Standard_Integer                           myAlign;\r
-  Standard_Integer                           myWidth;\r
-  Standard_Integer                           myHeight;\r
-  TCollection_ExtendedString                 mySource;\r
-  Standard_Integer                           mySrcProto;\r
-\r
-public:\r
-  DEFINE_STANDARD_RTTI(HTMLService_HTMLImage)\r
-};\r
-\r
-DEFINE_STANDARD_HANDLE(HTMLService_HTMLImage, HTMLService_HTML)\r
-\r
-#endif\r
+// File:      HTMLService_HTMLImage.hxx
+// Created:   13.10.2006
+// Author:    Sergey TELKOV
+// Copyright (C) AREVA NP 2006
+
+#ifndef HTMLSERVICE_HTMLIMAGE_H
+#define HTMLSERVICE_HTMLIMAGE_H
+
+#include <HTMLService.hxx>
+#include <HTMLService_HTML.hxx>
+
+#include <Quantity_Color.hxx>
+
+/*!
+  Class HTMLService_HTMLImage. Generator of the HTML image.
+*/
+
+class HTMLService_HTMLImage : public HTMLService_HTML
+{
+public:
+  enum { SP_Unknown, SP_File, SP_HTTP, SP_FTP } SourceProtocol;
+
+public:
+  Standard_EXPORT HTMLService_HTMLImage( const TCollection_ExtendedString& = TCollection_ExtendedString() );
+  Standard_EXPORT HTMLService_HTMLImage( const Handle(HTMLService_HTML)&,
+                                      const TCollection_ExtendedString& = TCollection_ExtendedString() );
+  Standard_EXPORT virtual ~HTMLService_HTMLImage();
+
+  Standard_EXPORT Standard_Integer           GetWidth() const;
+  Standard_EXPORT Standard_Integer           GetHeight() const;
+  Standard_EXPORT TCollection_ExtendedString GetSource() const;
+  Standard_EXPORT Standard_Integer           GetAlignment() const;
+  Standard_EXPORT Standard_Integer           GetSourceProtocol() const;
+
+  Standard_EXPORT void                       SetWidth( const Standard_Integer );
+  Standard_EXPORT void                       SetHeight( const Standard_Integer );
+  Standard_EXPORT void                       SetAlignment( const Standard_Integer );
+  Standard_EXPORT void                       SetSource( const TCollection_ExtendedString& );
+  Standard_EXPORT void                       SetSourceProtocol( const Standard_Integer& );
+
+protected:
+  Standard_EXPORT virtual void               Generate( SequenceOfHTMLLine& ) const;
+
+private:
+  TCollection_ExtendedString                 SourcePrefix() const;
+
+private:
+  Standard_Integer                           myAlign;
+  Standard_Integer                           myWidth;
+  Standard_Integer                           myHeight;
+  TCollection_ExtendedString                 mySource;
+  Standard_Integer                           mySrcProto;
+
+public:
+  DEFINE_STANDARD_RTTI(HTMLService_HTMLImage)
+};
+
+DEFINE_STANDARD_HANDLE(HTMLService_HTMLImage, HTMLService_HTML)
+
+#endif
index 1b65e5176864a7b474479c0fec7085272fae6078..a1db3560318c89280c04a19494588e22e7cdad86 100755 (executable)
@@ -1,44 +1,44 @@
-// File:      HTMLService_HTMLParagraph.hxx\r
-// Created:   13.10.2006\r
-// Author:    Sergey TELKOV\r
-// Copyright (C) AREVA NP 2006\r
-\r
-#ifndef HTMLSERVICE_HTMLPARAGRAPH_H\r
-#define HTMLSERVICE_HTMLPARAGRAPH_H\r
-\r
-#include <HTMLService.hxx>\r
-#include <HTMLService_HTMLText.hxx>\r
-\r
-/*!\r
-  Class HTMLService_HTMLParagraph. Generator of the HTML paragraph text.\r
-*/\r
-\r
-class HTMLSERVICE_EXPORT HTMLService_HTMLParagraph : public HTMLService_HTMLText\r
-{\r
-public:\r
-  Standard_EXPORT HTMLService_HTMLParagraph();\r
-  Standard_EXPORT HTMLService_HTMLParagraph( const Handle(HTMLService_HTML)& );\r
-  Standard_EXPORT virtual ~HTMLService_HTMLParagraph();\r
-\r
-  Standard_EXPORT Standard_Boolean GetNoBreak() const;\r
-  Standard_EXPORT void             SetNoBreak( const Standard_Boolean& );\r
-\r
-  Standard_EXPORT void             Clear();\r
-  Standard_EXPORT void             Insert( const Handle(HTMLService_HTML)& );\r
-  Standard_EXPORT void             InsertText( const TCollection_ExtendedString& );\r
-  Standard_EXPORT void             InsertImage( const TCollection_ExtendedString&,\r
-                                                const Standard_Integer = -1, const Standard_Integer = -1 );\r
-\r
-protected:\r
-  Standard_EXPORT virtual void     Generate( SequenceOfHTMLLine& ) const;\r
-\r
-private:\r
-  Standard_Boolean                 myNoBr;\r
-\r
-public:\r
-  DEFINE_STANDARD_RTTI(HTMLService_HTMLParagraph)\r
-};\r
-\r
-DEFINE_STANDARD_HANDLE(HTMLService_HTMLParagraph, HTMLService_HTMLText)\r
-\r
-#endif\r
+// File:      HTMLService_HTMLParagraph.hxx
+// Created:   13.10.2006
+// Author:    Sergey TELKOV
+// Copyright (C) AREVA NP 2006
+
+#ifndef HTMLSERVICE_HTMLPARAGRAPH_H
+#define HTMLSERVICE_HTMLPARAGRAPH_H
+
+#include <HTMLService.hxx>
+#include <HTMLService_HTMLText.hxx>
+
+/*!
+  Class HTMLService_HTMLParagraph. Generator of the HTML paragraph text.
+*/
+
+class HTMLService_HTMLParagraph : public HTMLService_HTMLText
+{
+public:
+  Standard_EXPORT HTMLService_HTMLParagraph();
+  Standard_EXPORT HTMLService_HTMLParagraph( const Handle(HTMLService_HTML)& );
+  Standard_EXPORT virtual ~HTMLService_HTMLParagraph();
+
+  Standard_EXPORT Standard_Boolean GetNoBreak() const;
+  Standard_EXPORT void             SetNoBreak( const Standard_Boolean& );
+
+  Standard_EXPORT void             Clear();
+  Standard_EXPORT void             Insert( const Handle(HTMLService_HTML)& );
+  Standard_EXPORT void             InsertText( const TCollection_ExtendedString& );
+  Standard_EXPORT void             InsertImage( const TCollection_ExtendedString&,
+                                                const Standard_Integer = -1, const Standard_Integer = -1 );
+
+protected:
+  Standard_EXPORT virtual void     Generate( SequenceOfHTMLLine& ) const;
+
+private:
+  Standard_Boolean                 myNoBr;
+
+public:
+  DEFINE_STANDARD_RTTI(HTMLService_HTMLParagraph)
+};
+
+DEFINE_STANDARD_HANDLE(HTMLService_HTMLParagraph, HTMLService_HTMLText)
+
+#endif
index 840f0aa0408ec98ddc09bc147843795a8b510d31..40b3b0b9125183155dd3ad58883557da212d7fb9 100755 (executable)
@@ -1,77 +1,77 @@
-// File:      HTMLService_HTMLTable.hxx\r
-// Created:   12.10.2006\r
-// Author:    Sergey TELKOV\r
-// Copyright (C) AREVA NP 2006\r
-\r
-#ifndef HTMLSERVICE_HTMLTABLE_H\r
-#define HTMLSERVICE_HTMLTABLE_H\r
-\r
-#include <HTMLService.hxx>\r
-#include <HTMLService_HTML.hxx>\r
-\r
-#include <HTMLService_HTMLTableRow.hxx>\r
-\r
-#include <TColStd_HArray1OfTransient.hxx>\r
-\r
-#include <Quantity_Color.hxx>\r
-\r
-/*!\r
-  Class HTMLService_HTMLTable. Generator of the HTML Table text.\r
-*/\r
-\r
-class HTMLSERVICE_EXPORT HTMLService_HTMLTable : public HTMLService_HTML\r
-{\r
-public:\r
-  Standard_EXPORT HTMLService_HTMLTable( const Standard_Integer = 0, const Standard_Integer = 0 );\r
-  Standard_EXPORT HTMLService_HTMLTable( const Handle(HTMLService_HTML)&, const Standard_Integer = 0, const Standard_Integer = 0 );\r
-  Standard_EXPORT virtual ~HTMLService_HTMLTable();\r
-\r
-  Standard_EXPORT Standard_Integer   GetNumRows() const;\r
-  Standard_EXPORT Standard_Integer   GetNumCols() const;\r
-\r
-  Standard_EXPORT Handle(HTMLService_HTMLTableRow)  GetRow( const Standard_Integer ) const;\r
-  Standard_EXPORT Handle(HTMLService_HTMLTableCell) GetCell( const Standard_Integer, const Standard_Integer ) const;\r
-\r
-  Standard_EXPORT Standard_Integer   GetBorder() const;\r
-  Standard_EXPORT Standard_Integer   GetCellSpacing() const;\r
-  Standard_EXPORT Standard_Integer   GetCellPadding() const;\r
-  Standard_EXPORT Quantity_Color     GetBackgroundColor() const;\r
-  Standard_EXPORT Standard_Integer   GetWidth( Standard_Boolean* = 0 ) const;\r
-\r
-  Standard_EXPORT void               SetBorder( const Standard_Integer );\r
-  Standard_EXPORT void               SetCellSpacing( const Standard_Integer );\r
-  Standard_EXPORT void               SetCellPadding( const Standard_Integer );\r
-  Standard_EXPORT void               SetBackgroundColor( const Quantity_Color& );\r
-  Standard_EXPORT void               SetWidth( const Standard_Integer,\r
-                                               const Standard_Boolean = Standard_False );\r
-\r
-  Standard_EXPORT void               SetRowSpan( const Standard_Integer, const Standard_Integer );\r
-  Standard_EXPORT void               SetColumnSpan( const Standard_Integer, const Standard_Integer );\r
-  Standard_EXPORT void               SetColumnWidth( const Standard_Integer, const Standard_Integer,\r
-                                                     const Standard_Boolean = Standard_False );\r
-\r
-protected:\r
-  Standard_EXPORT virtual void       Generate( SequenceOfHTMLLine& ) const;\r
-\r
-private:\r
-  void                               PrepareCells() const;\r
-  void                               Initialize( const Standard_Integer, const Standard_Integer );\r
-\r
-private:\r
-  Handle(TColStd_HArray1OfTransient) myRows;\r
-\r
-  Standard_Boolean                   myUseBC;\r
-  Standard_Integer                   myWidth;\r
-  Standard_Integer                   myBorder;\r
-  Standard_Boolean                   myPercent;\r
-  Quantity_Color                     myBgColor;\r
-  Standard_Integer                   mySpacing;\r
-  Standard_Integer                   myPadding;\r
-\r
-public:\r
-  DEFINE_STANDARD_RTTI(HTMLService_HTMLTable)\r
-};\r
-\r
-DEFINE_STANDARD_HANDLE(HTMLService_HTMLTable, HTMLService_HTML)\r
-\r
-#endif\r
+// File:      HTMLService_HTMLTable.hxx
+// Created:   12.10.2006
+// Author:    Sergey TELKOV
+// Copyright (C) AREVA NP 2006
+
+#ifndef HTMLSERVICE_HTMLTABLE_H
+#define HTMLSERVICE_HTMLTABLE_H
+
+#include <HTMLService.hxx>
+#include <HTMLService_HTML.hxx>
+
+#include <HTMLService_HTMLTableRow.hxx>
+
+#include <TColStd_HArray1OfTransient.hxx>
+
+#include <Quantity_Color.hxx>
+
+/*!
+  Class HTMLService_HTMLTable. Generator of the HTML Table text.
+*/
+
+class HTMLService_HTMLTable : public HTMLService_HTML
+{
+public:
+  Standard_EXPORT HTMLService_HTMLTable( const Standard_Integer = 0, const Standard_Integer = 0 );
+  Standard_EXPORT HTMLService_HTMLTable( const Handle(HTMLService_HTML)&, const Standard_Integer = 0, const Standard_Integer = 0 );
+  Standard_EXPORT virtual ~HTMLService_HTMLTable();
+
+  Standard_EXPORT Standard_Integer   GetNumRows() const;
+  Standard_EXPORT Standard_Integer   GetNumCols() const;
+
+  Standard_EXPORT Handle(HTMLService_HTMLTableRow)  GetRow( const Standard_Integer ) const;
+  Standard_EXPORT Handle(HTMLService_HTMLTableCell) GetCell( const Standard_Integer, const Standard_Integer ) const;
+
+  Standard_EXPORT Standard_Integer   GetBorder() const;
+  Standard_EXPORT Standard_Integer   GetCellSpacing() const;
+  Standard_EXPORT Standard_Integer   GetCellPadding() const;
+  Standard_EXPORT Quantity_Color     GetBackgroundColor() const;
+  Standard_EXPORT Standard_Integer   GetWidth( Standard_Boolean* = 0 ) const;
+
+  Standard_EXPORT void               SetBorder( const Standard_Integer );
+  Standard_EXPORT void               SetCellSpacing( const Standard_Integer );
+  Standard_EXPORT void               SetCellPadding( const Standard_Integer );
+  Standard_EXPORT void               SetBackgroundColor( const Quantity_Color& );
+  Standard_EXPORT void               SetWidth( const Standard_Integer,
+                                               const Standard_Boolean = Standard_False );
+
+  Standard_EXPORT void               SetRowSpan( const Standard_Integer, const Standard_Integer );
+  Standard_EXPORT void               SetColumnSpan( const Standard_Integer, const Standard_Integer );
+  Standard_EXPORT void               SetColumnWidth( const Standard_Integer, const Standard_Integer,
+                                                     const Standard_Boolean = Standard_False );
+
+protected:
+  Standard_EXPORT virtual void       Generate( SequenceOfHTMLLine& ) const;
+
+private:
+  void                               PrepareCells() const;
+  void                               Initialize( const Standard_Integer, const Standard_Integer );
+
+private:
+  Handle(TColStd_HArray1OfTransient) myRows;
+
+  Standard_Boolean                   myUseBC;
+  Standard_Integer                   myWidth;
+  Standard_Integer                   myBorder;
+  Standard_Boolean                   myPercent;
+  Quantity_Color                     myBgColor;
+  Standard_Integer                   mySpacing;
+  Standard_Integer                   myPadding;
+
+public:
+  DEFINE_STANDARD_RTTI(HTMLService_HTMLTable)
+};
+
+DEFINE_STANDARD_HANDLE(HTMLService_HTMLTable, HTMLService_HTML)
+
+#endif
index c90c0caae95f30f771a14db367631636b54d7a4e..57c33d20ba39b8fc01bfe5189cc4e8dd8f078b90 100755 (executable)
@@ -1,63 +1,63 @@
-// File:      HTMLService_HTMLTableCell.hxx\r
-// Created:   12.10.2006\r
-// Author:    Sergey TELKOV\r
-// Copyright (C) AREVA NP 2006\r
-\r
-#ifndef HTMLService_HTMLTABLECELL_H\r
-#define HTMLService_HTMLTABLECELL_H\r
-\r
-#include <HTMLService.hxx>\r
-#include <HTMLService_HTMLParagraph.hxx>\r
-\r
-#include <Quantity_Color.hxx>\r
-\r
-/*!\r
-  Class HTMLService_HTMLTableCell. Generator of the HTML Table cell text.\r
-*/\r
-\r
-class HTMLSERVICE_EXPORT HTMLService_HTMLTableCell : public HTMLService_HTMLParagraph\r
-{\r
-public:\r
-  Standard_EXPORT HTMLService_HTMLTableCell();\r
-  Standard_EXPORT HTMLService_HTMLTableCell( const Handle(HTMLService_HTML)& );\r
-  Standard_EXPORT virtual ~HTMLService_HTMLTableCell();\r
-\r
-  Standard_EXPORT Standard_Integer           GetColSpan() const;\r
-  Standard_EXPORT Standard_Integer           GetRowSpan() const;\r
-  Standard_EXPORT Standard_Integer           GetAlignment() const;\r
-  Standard_EXPORT Standard_Integer           GetWidth( Standard_Boolean* = 0 ) const;\r
-\r
-  Standard_EXPORT Quantity_Color             GetBackgroundColor() const;\r
-  Standard_EXPORT Standard_Boolean           IsHeaderCell() const;\r
-\r
-  Standard_EXPORT void                       SetColSpan( const Standard_Integer );\r
-  Standard_EXPORT void                       SetRowSpan( const Standard_Integer );\r
-  Standard_EXPORT void                       SetAlignment( const Standard_Integer );\r
-  Standard_EXPORT void                       SetWidth( const Standard_Integer,\r
-                                                       const Standard_Boolean = Standard_False );\r
-  Standard_EXPORT void                       SetBackgroundColor( const Quantity_Color& );\r
-  Standard_EXPORT void                       SetHeaderCell( const Standard_Boolean );\r
-\r
-protected:\r
-  Standard_EXPORT virtual void               Generate( SequenceOfHTMLLine& ) const;\r
-\r
-private:\r
-  TCollection_ExtendedString                 CellString() const;\r
-\r
-private:\r
-  Standard_Integer           myWidth;\r
-  Standard_Integer           myAlign;\r
-  Standard_Boolean           myUseBC;\r
-  Standard_Boolean           myPercent;\r
-  Standard_Integer           myColSpan;\r
-  Standard_Integer           myRowSpan;\r
-  Quantity_Color             myBgColor;\r
-  Standard_Boolean           myIsHeader;\r
-\r
-public:\r
-  DEFINE_STANDARD_RTTI(HTMLService_HTMLTableCell)\r
-};\r
-\r
-DEFINE_STANDARD_HANDLE(HTMLService_HTMLTableCell, HTMLService_HTMLParagraph)\r
-\r
-#endif\r
+// File:      HTMLService_HTMLTableCell.hxx
+// Created:   12.10.2006
+// Author:    Sergey TELKOV
+// Copyright (C) AREVA NP 2006
+
+#ifndef HTMLService_HTMLTABLECELL_H
+#define HTMLService_HTMLTABLECELL_H
+
+#include <HTMLService.hxx>
+#include <HTMLService_HTMLParagraph.hxx>
+
+#include <Quantity_Color.hxx>
+
+/*!
+  Class HTMLService_HTMLTableCell. Generator of the HTML Table cell text.
+*/
+
+class HTMLService_HTMLTableCell : public HTMLService_HTMLParagraph
+{
+public:
+  Standard_EXPORT HTMLService_HTMLTableCell();
+  Standard_EXPORT HTMLService_HTMLTableCell( const Handle(HTMLService_HTML)& );
+  Standard_EXPORT virtual ~HTMLService_HTMLTableCell();
+
+  Standard_EXPORT Standard_Integer           GetColSpan() const;
+  Standard_EXPORT Standard_Integer           GetRowSpan() const;
+  Standard_EXPORT Standard_Integer           GetAlignment() const;
+  Standard_EXPORT Standard_Integer           GetWidth( Standard_Boolean* = 0 ) const;
+
+  Standard_EXPORT Quantity_Color             GetBackgroundColor() const;
+  Standard_EXPORT Standard_Boolean           IsHeaderCell() const;
+
+  Standard_EXPORT void                       SetColSpan( const Standard_Integer );
+  Standard_EXPORT void                       SetRowSpan( const Standard_Integer );
+  Standard_EXPORT void                       SetAlignment( const Standard_Integer );
+  Standard_EXPORT void                       SetWidth( const Standard_Integer,
+                                                       const Standard_Boolean = Standard_False );
+  Standard_EXPORT void                       SetBackgroundColor( const Quantity_Color& );
+  Standard_EXPORT void                       SetHeaderCell( const Standard_Boolean );
+
+protected:
+  Standard_EXPORT virtual void               Generate( SequenceOfHTMLLine& ) const;
+
+private:
+  TCollection_ExtendedString                 CellString() const;
+
+private:
+  Standard_Integer           myWidth;
+  Standard_Integer           myAlign;
+  Standard_Boolean           myUseBC;
+  Standard_Boolean           myPercent;
+  Standard_Integer           myColSpan;
+  Standard_Integer           myRowSpan;
+  Quantity_Color             myBgColor;
+  Standard_Boolean           myIsHeader;
+
+public:
+  DEFINE_STANDARD_RTTI(HTMLService_HTMLTableCell)
+};
+
+DEFINE_STANDARD_HANDLE(HTMLService_HTMLTableCell, HTMLService_HTMLParagraph)
+
+#endif
index 6dd714e278a7e92e913b5199797b9c6283e801b0..d626a4f6d33d09e9f53ccf754e1eae76f5297700 100755 (executable)
@@ -1,50 +1,50 @@
-// File:      HTMLService_HTMLTableRow.hxx\r
-// Created:   12.10.2006\r
-// Author:    Sergey TELKOV\r
-// Copyright (C) AREVA NP 2006\r
-\r
-#ifndef HTMLService_HTMLTABLEROW_H\r
-#define HTMLService_HTMLTABLEROW_H\r
-\r
-#include <HTMLService.hxx>\r
-#include <HTMLService_HTML.hxx>\r
-\r
-#include <HTMLService_HTMLTableCell.hxx>\r
-\r
-#include <TColStd_HArray1OfTransient.hxx>\r
-\r
-/*!\r
-  Class HTMLService_HTMLTableRow. Generator of the HTML Table row text.\r
-*/\r
-\r
-class HTMLSERVICE_EXPORT HTMLService_HTMLTableRow : public HTMLService_HTML\r
-{\r
-public:\r
-  Standard_EXPORT HTMLService_HTMLTableRow( const Standard_Integer = 0 );\r
-  Standard_EXPORT HTMLService_HTMLTableRow( const Handle(HTMLService_HTML)&, const Standard_Integer = 0 );\r
-  Standard_EXPORT virtual ~HTMLService_HTMLTableRow();\r
-\r
-  Standard_EXPORT Standard_Integer          GetSize() const;\r
-  Standard_EXPORT Handle(HTMLService_HTMLTableCell) GetCell( const Standard_Integer ) const;\r
-\r
-  Standard_EXPORT Quantity_Color            GetBackgroundColor() const;\r
-  Standard_EXPORT void                      SetBackgroundColor( const Quantity_Color& );\r
-\r
-protected:\r
-  Standard_EXPORT virtual void              Generate( SequenceOfHTMLLine& ) const;\r
-\r
-private:\r
-  void                                      Initialize( const Standard_Integer );\r
-\r
-private:\r
-  Handle(TColStd_HArray1OfTransient)        myCells;\r
-  Standard_Boolean                          myUseBC;\r
-  Quantity_Color                            myBgColor;\r
-\r
-public:\r
-  DEFINE_STANDARD_RTTI(HTMLService_HTMLTableRow)\r
-};\r
-\r
-DEFINE_STANDARD_HANDLE(HTMLService_HTMLTableRow, HTMLService_HTML)\r
-\r
-#endif\r
+// File:      HTMLService_HTMLTableRow.hxx
+// Created:   12.10.2006
+// Author:    Sergey TELKOV
+// Copyright (C) AREVA NP 2006
+
+#ifndef HTMLService_HTMLTABLEROW_H
+#define HTMLService_HTMLTABLEROW_H
+
+#include <HTMLService.hxx>
+#include <HTMLService_HTML.hxx>
+
+#include <HTMLService_HTMLTableCell.hxx>
+
+#include <TColStd_HArray1OfTransient.hxx>
+
+/*!
+  Class HTMLService_HTMLTableRow. Generator of the HTML Table row text.
+*/
+
+class HTMLService_HTMLTableRow : public HTMLService_HTML
+{
+public:
+  Standard_EXPORT HTMLService_HTMLTableRow( const Standard_Integer = 0 );
+  Standard_EXPORT HTMLService_HTMLTableRow( const Handle(HTMLService_HTML)&, const Standard_Integer = 0 );
+  Standard_EXPORT virtual ~HTMLService_HTMLTableRow();
+
+  Standard_EXPORT Standard_Integer          GetSize() const;
+  Standard_EXPORT Handle(HTMLService_HTMLTableCell) GetCell( const Standard_Integer ) const;
+
+  Standard_EXPORT Quantity_Color            GetBackgroundColor() const;
+  Standard_EXPORT void                      SetBackgroundColor( const Quantity_Color& );
+
+protected:
+  Standard_EXPORT virtual void              Generate( SequenceOfHTMLLine& ) const;
+
+private:
+  void                                      Initialize( const Standard_Integer );
+
+private:
+  Handle(TColStd_HArray1OfTransient)        myCells;
+  Standard_Boolean                          myUseBC;
+  Quantity_Color                            myBgColor;
+
+public:
+  DEFINE_STANDARD_RTTI(HTMLService_HTMLTableRow)
+};
+
+DEFINE_STANDARD_HANDLE(HTMLService_HTMLTableRow, HTMLService_HTML)
+
+#endif
index 4cd110102f3a5f132077630962012181744eec7c..06155bf72d25c8f27f76c8c21a64d5864470e290 100755 (executable)
@@ -1,58 +1,58 @@
-// File:      HTMLService_HTMLText.hxx\r
-// Created:   13.10.2006\r
-// Author:    Sergey TELKOV\r
-// Copyright (C) AREVA NP 2006\r
-\r
-#ifndef HTMLSERVICE_HTMLTEXT_H\r
-#define HTMLSERVICE_HTMLTEXT_H\r
-\r
-#include <HTMLService.hxx>\r
-#include <HTMLService_HTML.hxx>\r
-\r
-#include <Quantity_Color.hxx>\r
-\r
-/*!\r
-  Class HTMLService_HTMLText. Generator of the simple HTML text.\r
-*/\r
-\r
-class HTMLSERVICE_EXPORT HTMLService_HTMLText : public HTMLService_HTML\r
-{\r
-public:\r
-  enum { Normal = 0x00, Bold = 0x01, Italic = 0x02, Underline = 0x04,\r
-         StrikeOut = 0x08, Subscript = 0x10, Superscript = 0x20 } FontFlags;\r
-\r
-public:\r
-  Standard_EXPORT HTMLService_HTMLText( const TCollection_ExtendedString& = TCollection_ExtendedString(),\r
-                                     const Standard_Integer = Normal );\r
-  Standard_EXPORT HTMLService_HTMLText( const Handle(HTMLService_HTML)&,\r
-                                     const TCollection_ExtendedString& = TCollection_ExtendedString(),\r
-                                     const Standard_Integer = Normal );\r
-  Standard_EXPORT virtual ~HTMLService_HTMLText();\r
-\r
-  Standard_EXPORT TCollection_ExtendedString GetText() const;\r
-  Standard_EXPORT Standard_Integer           GetFontFlags() const;\r
-  Standard_EXPORT Standard_Integer           GetHeadingLevel() const;\r
-  Standard_EXPORT Quantity_Color             GetForegroundColor() const;\r
-\r
-  Standard_EXPORT void                       SetFontFlags( const Standard_Integer );\r
-  Standard_EXPORT void                       SetHeadingLevel( const Standard_Integer );\r
-  Standard_EXPORT void                       SetForegroundColor( const Quantity_Color& );\r
-  Standard_EXPORT void                       SetText( const TCollection_ExtendedString& );\r
-\r
-protected:\r
-  Standard_EXPORT virtual void               Generate( SequenceOfHTMLLine& ) const;\r
-\r
-private:\r
-  TCollection_ExtendedString myText;\r
-  Quantity_Color             myColor;\r
-  Standard_Integer           myHeading;\r
-  Standard_Boolean           myUseColor;\r
-  Standard_Integer           myFontFlags;\r
-\r
-public:\r
-  DEFINE_STANDARD_RTTI(HTMLService_HTMLText)\r
-};\r
-\r
-DEFINE_STANDARD_HANDLE(HTMLService_HTMLText, HTMLService_HTML)\r
-\r
-#endif\r
+// File:      HTMLService_HTMLText.hxx
+// Created:   13.10.2006
+// Author:    Sergey TELKOV
+// Copyright (C) AREVA NP 2006
+
+#ifndef HTMLSERVICE_HTMLTEXT_H
+#define HTMLSERVICE_HTMLTEXT_H
+
+#include <HTMLService.hxx>
+#include <HTMLService_HTML.hxx>
+
+#include <Quantity_Color.hxx>
+
+/*!
+  Class HTMLService_HTMLText. Generator of the simple HTML text.
+*/
+
+class HTMLService_HTMLText : public HTMLService_HTML
+{
+public:
+  enum { Normal = 0x00, Bold = 0x01, Italic = 0x02, Underline = 0x04,
+         StrikeOut = 0x08, Subscript = 0x10, Superscript = 0x20 } FontFlags;
+
+public:
+  Standard_EXPORT HTMLService_HTMLText( const TCollection_ExtendedString& = TCollection_ExtendedString(),
+                                     const Standard_Integer = Normal );
+  Standard_EXPORT HTMLService_HTMLText( const Handle(HTMLService_HTML)&,
+                                     const TCollection_ExtendedString& = TCollection_ExtendedString(),
+                                     const Standard_Integer = Normal );
+  Standard_EXPORT virtual ~HTMLService_HTMLText();
+
+  Standard_EXPORT TCollection_ExtendedString GetText() const;
+  Standard_EXPORT Standard_Integer           GetFontFlags() const;
+  Standard_EXPORT Standard_Integer           GetHeadingLevel() const;
+  Standard_EXPORT Quantity_Color             GetForegroundColor() const;
+
+  Standard_EXPORT void                       SetFontFlags( const Standard_Integer );
+  Standard_EXPORT void                       SetHeadingLevel( const Standard_Integer );
+  Standard_EXPORT void                       SetForegroundColor( const Quantity_Color& );
+  Standard_EXPORT void                       SetText( const TCollection_ExtendedString& );
+
+protected:
+  Standard_EXPORT virtual void               Generate( SequenceOfHTMLLine& ) const;
+
+private:
+  TCollection_ExtendedString myText;
+  Quantity_Color             myColor;
+  Standard_Integer           myHeading;
+  Standard_Boolean           myUseColor;
+  Standard_Integer           myFontFlags;
+
+public:
+  DEFINE_STANDARD_RTTI(HTMLService_HTMLText)
+};
+
+DEFINE_STANDARD_HANDLE(HTMLService_HTMLText, HTMLService_HTML)
+
+#endif
index aafb19a4ffb3e2a781d3065137a684c7543d64eb..121b5e8b288edbf7b95afc7de0457080b56e9eb7 100644 (file)
@@ -1,17 +1,17 @@
-TEMPLATE = lib
+unix:TEMPLATE = lib
+win32:TEMPLATE = vclib
 
 DESTDIR = ../../$(CONFIG_ID)/lib
 MOC_DIR = ../../moc
 OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
 
 INCLUDEPATH = ../../include
-win32:LIBS += ../../lib/suit.lib ../../lib/qtx.lib
-unix:LIBS += -L../../$(CONFIG_ID)/lib -lSUIT -lQtx
+LIBS += -L../../$(CONFIG_ID)/lib -lSUIT -lQtx
 
 CONFIG -= debug release debug_and_release
 CONFIG += qt thread debug dll shared
 
-win32:DEFINES += WIN32
+win32:DEFINES += WNT WIN32
 DEFINES += LOGWINDOW_EXPORTS
 
 HEADERS = *.h
@@ -25,7 +25,7 @@ win32:GUIResources = ..\\..\\resources
 
 lrelease.name = LRELASE ${QMAKE_FILE_IN}
 unix:lrelease.commands = $(QTDIR)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
-win32:lrelease.commands = $(QTDIR)\\bin\\lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
+win32:lrelease.commands = $(QTDIR)\\bin\\lrelease ${QMAKE_FILE_IN} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
 unix:lrelease.output = $${GUIResources}/${QMAKE_FILE_BASE}.qm
 win32:lrelease.output = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
 lrelease.input = TRANSLATIONS
@@ -34,6 +34,12 @@ win32:lrelease.clean = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
 lrelease.CONFIG += no_link target_predeps
 QMAKE_EXTRA_COMPILERS += lrelease
 
+win32:copy_hdr.name = Install ${QMAKE_FILE_IN}
+win32:copy_hdr.commands = type ${QMAKE_FILE_IN} > ../../include/${QMAKE_FILE_BASE}.h
+win32:copy_hdr.output = ../../include/${QMAKE_FILE_BASE}.h
+win32:copy_hdr.input = HEADERS
+win32:QMAKE_EXTRA_COMPILERS += copy_hdr
+
 includes.files = $$HEADERS
 includes.path = ../../include
 
index 86459b714704329f8a2551431fe8f863b1ac7111..5400a4b8bb081ee9a3503c286b325adf395d9e33 100644 (file)
@@ -1,4 +1,5 @@
-TEMPLATE = lib
+unix:TEMPLATE = lib
+win32:TEMPLATE = vclib
 
 DESTDIR = ../../$(CONFIG_ID)/lib
 MOC_DIR = ../../moc
@@ -6,7 +7,8 @@ OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
 
 CAS_CPPFLAGS = $(CASINC)
 
-CAS_LDPATH = -L$(CASLIB) -lTKV3d
+unix:CAS_LDPATH = -L$(CASLIB) -lTKV3d
+win32:CAS_LDPATH = -L$(CASLIB) -lTKernel -lTKMath -lTKV3d
 
 INCLUDEPATH += ../../include $${CAS_CPPFLAGS}
 LIBS += $${CAS_LDPATH}
@@ -14,7 +16,7 @@ LIBS += $${CAS_LDPATH}
 CONFIG -= debug release debug_and_release
 CONFIG += qt thread debug dll shared
 
-win32:DEFINES += WIN32 
+win32:DEFINES += WNT WIN32 
 DEFINES += $(CASDEFINES) OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS
 
 HEADERS  = *.hxx
@@ -24,6 +26,13 @@ HEADERS += *.jxx
 
 SOURCES  = *.cxx
 
+win32:COPY_FILES = *.hxx *.h
+win32:copy_hxx.name = Install(.hxx) ${QMAKE_FILE_IN}
+win32:copy_hxx.commands = type ${QMAKE_FILE_IN} > ../../include/${QMAKE_FILE_BASE}.hxx
+win32:copy_hxx.output = ../../include/${QMAKE_FILE_BASE}.hxx
+win32:copy_hxx.input = COPY_FILES
+win32:QMAKE_EXTRA_COMPILERS += copy_hxx
+
 includes.files = $$HEADERS
 includes.path = ../../include
 
index 61bf93c5bd9bfdaa6f959008b0da065d8e0fa9aa..0a11142b5110bbce052291c9117230173ef7f0e9 100644 (file)
@@ -1,4 +1,5 @@
-TEMPLATE = lib
+unix:TEMPLATE = lib
+win32:TEMPLATE = vclib
 
 DESTDIR = ../../$(CONFIG_ID)/lib
 MOC_DIR = ../../moc
@@ -10,8 +11,8 @@ LIBS += -L../../$(CONFIG_ID)/lib -lQtx
 CONFIG -= debug release debug_and_release
 CONFIG += qt thread debug dll shared
 
-win32:DEFINES += WIN32
-DEFINES += LOGWINDOW_EXPORTS
+win32:DEFINES += WNT WIN32
+DEFINES += OB_EXPORTS
 
 HEADERS = *.h
 
@@ -24,7 +25,7 @@ win32:GUIResources = ..\\..\\resources
 
 lrelease.name = LRELASE ${QMAKE_FILE_IN}
 unix:lrelease.commands = $(QTDIR)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
-win32:lrelease.commands = $(QTDIR)\\bin\\lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
+win32:lrelease.commands = $(QTDIR)\\bin\\lrelease ${QMAKE_FILE_IN} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
 unix:lrelease.output = $${GUIResources}/${QMAKE_FILE_BASE}.qm
 win32:lrelease.output = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
 lrelease.input = TRANSLATIONS
@@ -33,6 +34,13 @@ win32:lrelease.clean = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
 lrelease.CONFIG += no_link target_predeps
 QMAKE_EXTRA_COMPILERS += lrelease
 
+win32:copy_hdr.name = Install ${QMAKE_FILE_IN}
+win32:copy_hdr.commands = type ${QMAKE_FILE_IN} > ../../include/${QMAKE_FILE_BASE}.h
+win32:copy_hdr.output = ../../include/${QMAKE_FILE_BASE}.h
+win32:copy_hdr.input = HEADERS
+win32:QMAKE_EXTRA_COMPILERS += copy_hdr
+
+
 includes.files = $$HEADERS
 includes.path = ../../include