Add API declarations

[libs/gltk.git] / source / geometry.h

diff --git a/source/geometry.h b/source/geometry.h
index 6559414dd0497ae5cdd8a8e8a0136ed6af062876..8c8c9897335caa0fd55ea79666c2f78de1a73db0 100644 (file)
--- a/source/geometry.h
+++ b/source/geometry.h
@@ -1,14 +1,8 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GLTK_GEOMETRY_H_
 #define MSP_GLTK_GEOMETRY_H_
 
-#include <msp/datafile/loader.h>
+#include <msp/datafile/objectloader.h>
+#include "mspgltk_api.h"
 
 namespace Msp {
 namespace GLtk {
@@ -16,7 +10,7 @@ namespace GLtk {
 /**
 Specifies the position and size of a widget or graphic.
 */
-struct Geometry
+struct MSPGLTK_API Geometry
 {
        int x, y;
        unsigned w, h;
@@ -24,21 +18,22 @@ struct Geometry
        Geometry(): x(0), y(0), w(1), h(1) { }
        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;
 };
 
 
 /**
 Specifies margins on the sides of an element.
 */
-struct Sides
+struct MSPGLTK_API Sides
 {
-       class Loader: public DataFile::Loader
+       class Loader: public DataFile::ObjectLoader<Sides>
        {
        public:
                Loader(Sides &);
-               Sides &get_object() { return sides; }
        private:
-               Sides &sides;
+               void horizontal(unsigned);
+               void vertical(unsigned);
        };
 
        unsigned top;
@@ -47,18 +42,22 @@ struct Sides
        unsigned left;
 
        Sides();
+       Sides(unsigned);
+       Sides(unsigned, unsigned);
+       Sides(unsigned, unsigned, unsigned);
+       Sides(unsigned, unsigned, unsigned, unsigned);
 };
 
 
 /**
 Performs alignment of nested geometries, such as widgets and their parts.
 */
-struct Alignment
+struct MSPGLTK_API Alignment
 {
        float x, y;
+       float w, h;
 
-       Alignment(): x(0), y(0) { }
-       Alignment(float x_, float y_): x(x_), y(y_) { }
+       Alignment(): x(0), y(0), w(1), h(1) { }
        void apply(Geometry &, const Geometry &) const;
        void apply(Geometry &, const Geometry &, const Sides &) const;
 };