[Libreoffice-commits] .: Branch 'feature/layout' - vcl/inc vcl/source vcl/util

[Michael Meeks]

 vcl/inc/vcl/align.hxx         |    4 ++--
 vcl/inc/vcl/box.hxx           |    7 ++++---
 vcl/inc/vcl/buttonbox.hxx     |    3 ++-
 vcl/inc/vcl/layout.hxx        |   13 +++++++------
 vcl/inc/vcl/ldialog.hxx       |    1 +
 vcl/inc/vcl/notebook.hxx      |    1 +
 vcl/inc/vcl/table.hxx         |    3 ++-
 vcl/source/layout/makefile.mk |    4 ----
 vcl/util/makefile.mk          |    1 +
 9 files changed, 20 insertions(+), 17 deletions(-)

New commits:
commit 25b8e25e5b59565879cc49d0c206207cb0a773cd
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Thu Dec 16 17:37:44 2010 +0000

    add visibility annotation and link the layout code into libvcl

diff --git a/vcl/inc/vcl/align.hxx b/vcl/inc/vcl/align.hxx
index b198e64..90a7df9 100644
--- a/vcl/inc/vcl/align.hxx
+++ b/vcl/inc/vcl/align.hxx
@@ -26,7 +26,7 @@
 /* Lays various widgets in a row or column.
 */
 
-class Align : public Layout
+class VCL_DLLPUBLIC Align : public Layout
 {
 public:
     Align (float xalign, float yalign, float xscale, float yscale);
@@ -56,7 +56,7 @@ protected:
     Widget m_parent, m_child;
 };
 
-class AlignCenter : public Align
+class VCL_DLLPUBLIC AlignCenter : public Align
 {
 public:
     AlignCenter() : Align (.5, .5, 0, 0) {}
diff --git a/vcl/inc/vcl/box.hxx b/vcl/inc/vcl/box.hxx
index 619d2a2..92bc1b1 100644
--- a/vcl/inc/vcl/box.hxx
+++ b/vcl/inc/vcl/box.hxx
@@ -21,12 +21,13 @@
 #ifndef VCL_BOX_HXX
 #define VCL_BOX_HXX
 
+#include <vcl/dllapi.h>
 #include <vcl/layout.hxx>
 
 /* Lays various widgets in a row or column.
 */
 
-class Box : public Layout
+class VCL_DLLPUBLIC Box : public Layout
 {
 public:
     enum Orientation { HORIZONTAL, VERTICAL };
@@ -72,12 +73,12 @@ protected:
     Widget m_parent;
 };
 
-struct HBox : public Box {
+struct VCL_DLLPUBLIC HBox : public Box {
     HBox (bool homogeneous, int spacing)
     : Box (HORIZONTAL, homogeneous, spacing) {}
 };
 
-struct VBox : public Box {
+struct VCL_DLLPUBLIC VBox : public Box {
     VBox (bool homogeneous, int spacing)
     : Box (VERTICAL, homogeneous, spacing) {}
 };
diff --git a/vcl/inc/vcl/buttonbox.hxx b/vcl/inc/vcl/buttonbox.hxx
index 9cec0e0..0d14cad 100644
--- a/vcl/inc/vcl/buttonbox.hxx
+++ b/vcl/inc/vcl/buttonbox.hxx
@@ -21,6 +21,7 @@
 #ifndef VCL_BOX_HXX
 #define VCL_BUTTON_BOX_HXX
 
+#include <vcl/dllapi.h>
 #include <vcl/box.hxx>
 #include <map>
 
@@ -30,7 +31,7 @@
 
 class Button;
 
-class ButtonBox : public HBox
+class VCL_DLLPUBLIC ButtonBox : public HBox
 {
 public:
     ButtonBox();
diff --git a/vcl/inc/vcl/layout.hxx b/vcl/inc/vcl/layout.hxx
index 6dbf708..694a823 100644
--- a/vcl/inc/vcl/layout.hxx
+++ b/vcl/inc/vcl/layout.hxx
@@ -21,6 +21,7 @@
 #ifndef VCL_LAYOUT_HXX
 #define VCL_LAYOUT_HXX
 
+#include <vcl/dllapi.h>
 #include <list>
 #include <tools/gen.hxx>
 #include <stdio.h>
@@ -31,7 +32,7 @@ class Layout;
 /* Container that encapsulates Window and Layout implementations.
 */
 
-class Widget
+class VCL_DLLPUBLIC Widget
 {
 public:
     Widget (Window *window);
@@ -67,12 +68,12 @@ public:
     static Widget NIL;
 
 private:
-    Window *GetParentWindow() const;
-    void SetParentWindow (Window *parent);
+    SAL_DLLPRIVATE Window *GetParentWindow() const;
+    SAL_DLLPRIVATE void SetParentWindow (Window *parent);
 
     typedef void (* ForeachCallback) (Widget &widget);
-    void Foreach (ForeachCallback callback);
-    static void ShowWidget (Widget &widget);
+    SAL_DLLPRIVATE void Foreach (ForeachCallback callback);
+    SAL_DLLPRIVATE static void ShowWidget (Widget &widget);
 
     Window *m_window;
     Layout *m_layout;
@@ -81,7 +82,7 @@ private:
 /* Interface implemented by containers.
 */
 
-class Layout
+class VCL_DLLPUBLIC Layout
 {
 public:
     // Common methods to manipulate layout children: containers may
diff --git a/vcl/inc/vcl/ldialog.hxx b/vcl/inc/vcl/ldialog.hxx
index 6a0e572..4448e56 100644
--- a/vcl/inc/vcl/ldialog.hxx
+++ b/vcl/inc/vcl/ldialog.hxx
@@ -21,6 +21,7 @@
 #ifndef VCL_LDIALOG_HXX
 #define VCL_LDIALOG_HXX
 
+#include <vcl/dllapi.h>
 #include <vcl/dialog.hxx>
 #include <vcl/layout.hxx>
 
diff --git a/vcl/inc/vcl/notebook.hxx b/vcl/inc/vcl/notebook.hxx
index a22f288..3fd2a1c 100644
--- a/vcl/inc/vcl/notebook.hxx
+++ b/vcl/inc/vcl/notebook.hxx
@@ -21,6 +21,7 @@
 #ifndef VCL_NOTEBOOK_HXX
 #define VCL_NOTEBOOK_HXX
 
+#include <vcl/dllapi.h>
 #include <vcl/tabctrl.hxx>
 #include <vcl/layout.hxx>
 #include <vector>
diff --git a/vcl/inc/vcl/table.hxx b/vcl/inc/vcl/table.hxx
index edfc516..4bcfe28 100644
--- a/vcl/inc/vcl/table.hxx
+++ b/vcl/inc/vcl/table.hxx
@@ -21,13 +21,14 @@
 #ifndef VCL_TABLE_HXX
 #define VCL_TABLE_HXX
 
+#include <vcl/dllapi.h>
 #include <vcl/layout.hxx>
 #include <vector>
 
 /* Lays various widgets in a grid.
 */
 
-class Table : public Layout
+class VCL_DLLPUBLIC Table : public Layout
 {
 public:
     Table (int cols);
diff --git a/vcl/source/layout/makefile.mk b/vcl/source/layout/makefile.mk
index c6ee909..7d955e9 100644
--- a/vcl/source/layout/makefile.mk
+++ b/vcl/source/layout/makefile.mk
@@ -37,10 +37,6 @@ TARGET=layout
 .INCLUDE :	settings.mk
 .INCLUDE :  $(PRJ)$/util$/makefile2.pmk
 
-.IF "$(COM)"=="ICC"
-CDEFS+=-D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE
-.ENDIF
-
 # --- Files --------------------------------------------------------
 
 SLOFILES=	$(SLO)$/align.obj			\
diff --git a/vcl/util/makefile.mk b/vcl/util/makefile.mk
index 983530c..83b5ba9 100644
--- a/vcl/util/makefile.mk
+++ b/vcl/util/makefile.mk
@@ -144,6 +144,7 @@ LIB1TARGET= $(SLB)$/$(TARGET).lib
 LIB1FILES=  $(SLB)$/app.lib         \
             $(SLB)$/gdi.lib         \
             $(SLB)$/win.lib         \
+            $(SLB)$/layout.lib      \
             $(SLB)$/ctrl.lib        \
             $(SLB)$/helper.lib	    \
             $(SLB)$/fontsubset.lib  \