X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgeometry.h;h=4fe6a75ae33dab5a89fa2f907a177a6ee644fcc9;hb=033732b500a35f3737bad515349d884cb3f123f0;hp=6fa8e7f1287ffd1f39942979f1f046889bc97ecc;hpb=8f6f543758fb1b2b17ae2db519198d420eb9982d;p=libs%2Fgltk.git

diff --git a/source/geometry.h b/source/geometry.h
index 6fa8e7f..4fe6a75 100644
--- a/source/geometry.h
+++ b/source/geometry.h
@@ -8,7 +8,7 @@ Distributed under the LGPL
 #ifndef MSP_GLTK_GEOMETRY_H_
 #define MSP_GLTK_GEOMETRY_H_
 
-#include <msp/datafile/loader.h>
+#include <msp/datafile/objectloader.h>
 
 namespace Msp {
 namespace GLtk {
@@ -24,6 +24,7 @@ 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;
 };
 
 
@@ -32,13 +33,10 @@ Specifies margins on the sides of an element.
 */
 struct Sides
 {
-	class Loader: public DataFile::Loader
+	class Loader: public DataFile::ObjectLoader<Sides>
 	{
 	public:
 		Loader(Sides &);
-		Sides &get_object() { return sides; }
-	private:
-		Sides &sides;
 	};
 
 	unsigned top;