X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgeometry.h;h=fac3bbc7a506ea9cde32a37fad8a5e50618d562a;hb=9f38197854e699a6093a906ab43f4238f3cd2388;hp=1451a0633e23b5b1107b1ae39f91338820e170ce;hpb=371dd319aea53d727a91c64240b942dab983783a;p=libs%2Fgltk.git

diff --git a/source/geometry.h b/source/geometry.h
index 1451a06..fac3bbc 100644
--- a/source/geometry.h
+++ b/source/geometry.h
@@ -2,6 +2,7 @@
 #define MSP_GLTK_GEOMETRY_H_
 
 #include <msp/datafile/objectloader.h>
+#include "mspgltk_api.h"
 
 namespace Msp {
 namespace GLtk {
@@ -9,12 +10,14 @@ namespace GLtk {
 /**
 Specifies the position and size of a widget or graphic.
 */
-struct Geometry
+struct MSPGLTK_API Geometry
 {
-	int x, y;
-	unsigned w, h;
+	int x = 0;
+	int y = 0;
+	unsigned w = 1;
+	unsigned h = 1;
 
-	Geometry(): x(0), y(0), w(1), h(1) { }
+	Geometry() = default;
 	Geometry(int x_, int y_, unsigned w_, unsigned h_): x(x_), y(y_), w(w_), h(h_) { }
 	bool is_inside(int, int) const;
 	bool is_inside_relative(int, int) const;
@@ -24,7 +27,7 @@ struct Geometry
 /**
 Specifies margins on the sides of an element.
 */
-struct Sides
+struct MSPGLTK_API Sides
 {
 	class Loader: public DataFile::ObjectLoader<Sides>
 	{
@@ -35,12 +38,12 @@ struct Sides
 		void vertical(unsigned);
 	};
 
-	unsigned top;
-	unsigned right;
-	unsigned bottom;
-	unsigned left;
+	unsigned top = 0;
+	unsigned right = 0;
+	unsigned bottom = 0;
+	unsigned left = 0;
 
-	Sides();
+	Sides() = default;
 	Sides(unsigned);
 	Sides(unsigned, unsigned);
 	Sides(unsigned, unsigned, unsigned);
@@ -51,12 +54,13 @@ struct Sides
 /**
 Performs alignment of nested geometries, such as widgets and their parts.
 */
-struct Alignment
+struct MSPGLTK_API Alignment
 {
-	float x, y;
-	float w, h;
+	float x = 0.0f;
+	float y = 0.0f;
+	float w = 1.0f;
+	float h = 1.0f;
 
-	Alignment(): x(0), y(0), w(1), h(1) { }
 	void apply(Geometry &, const Geometry &) const;
 	void apply(Geometry &, const Geometry &, const Sides &) const;
 };