X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flayout.h;h=7986686c86e440757cbe6d2172526fa8844b275e;hb=56c41b294aa47a38ac3e1be70d4868f260cb4274;hp=141a15cdb317d7920fd394778312f28002228b24;hpb=deebbb5d23f7bdad0e25fe7eeb0a3e5a4eaf761f;p=libs%2Fgltk.git

diff --git a/source/layout.h b/source/layout.h
index 141a15c..7986686 100644
--- a/source/layout.h
+++ b/source/layout.h
@@ -6,6 +6,7 @@
 #include <sigc++/trackable.h>
 #include <msp/strings/lexicalcast.h>
 #include "geometry.h"
+#include "mspgltk_api.h"
 
 namespace Msp {
 namespace GLtk {
@@ -50,7 +51,7 @@ Since specifiyng constraints manually can be quite tedious, an Arrangement
 interface is provided to automatically arrange widgets.  See classes Row,
 Column and Grid for some commonly used arrangements.
 */
-class Layout
+class MSPGLTK_API Layout
 {
 private:
 	enum
@@ -63,8 +64,9 @@ private:
 		TARGET_POS = 8,
 		TARGET_DIM = 16,
 		TARGET_MASK = 24,
-		SPACING = 32,
-		SLACK = 64
+		HALF_DIM = 32,
+		SPACING = 64,
+		SLACK = 128
 	};
 
 public:
@@ -79,8 +81,10 @@ public:
 		FAR_RIGHT_OF = HORIZONTAL|SELF_POS|TARGET_POS|TARGET_DIM|SPACING|SLACK,
 		FAR_LEFT_OF = HORIZONTAL|SELF_POS|SELF_DIM|TARGET_POS|SPACING|SLACK,
 		ALIGN_TOP = VERTICAL|SELF_POS|SELF_DIM|TARGET_POS|TARGET_DIM,
+		ALIGN_VCENTER = VERTICAL|SELF_POS|SELF_DIM|TARGET_POS|TARGET_DIM|HALF_DIM,
 		ALIGN_BOTTOM = VERTICAL|SELF_POS|TARGET_POS,
 		ALIGN_RIGHT = HORIZONTAL|SELF_POS|SELF_DIM|TARGET_POS|TARGET_DIM,
+		ALIGN_HCENTER = HORIZONTAL|SELF_POS|SELF_DIM|TARGET_POS|TARGET_DIM|HALF_DIM,
 		ALIGN_LEFT = HORIZONTAL|SELF_POS|TARGET_POS,
 		COPY_WIDTH = HORIZONTAL|SELF_DIM|TARGET_DIM,
 		COPY_HEIGHT = VERTICAL|SELF_DIM|TARGET_DIM
@@ -239,7 +243,7 @@ private:
 	void solve_constraints(int, SolveMode);
 };
 
-void operator>>(const LexicalConverter &, Layout::ConstraintType &);
+MSPGLTK_API void operator>>(const LexicalConverter &, Layout::ConstraintType &);
 
 } // namespace GLtk
 } // namespace Msp