X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpanel.h;h=79e8bd455a3b36cbd76f9f113641cb81baa79731;hb=8eeb6ee5d40c21150839e24996cc3e9ef308374d;hp=c50725b9b940cb255ed635ad665cc82c55bddfe7;hpb=1b29f1987b8891852a606afbb03e5e08b16c8c3e;p=libs%2Fgltk.git

diff --git a/source/panel.h b/source/panel.h
index c50725b..79e8bd4 100644
--- a/source/panel.h
+++ b/source/panel.h
@@ -2,12 +2,11 @@
 #define MSP_GLTK_PANEL_H_
 
 #include "container.h"
+#include "layout.h"
 
 namespace Msp {
 namespace GLtk {
 
-class Layout;
-
 /**
 Panels are containers for other widgets.  Panel styles should have a special
 part "children" to render the child widgets.  All properties of this part are
@@ -16,23 +15,43 @@ ignored.
 class Panel: public Container
 {
 public:
-	class Loader: public Widget::Loader
+	class Loader: public DataFile::DerivedObjectLoader<Panel, Widget::Loader>
 	{
 	public:
 		typedef std::map<std::string, Widget *> WidgetMap;
 
-	private:
-		Panel &pnl;
+	protected:
 		WidgetMap &wdg_map;
+		Widget *last_widget;
 	
 	public:
 		Loader(Panel &, WidgetMap &);
 	private:
+		Layout &get_layout();
+		Widget &get_last_widget();
+		template<typename T>
+		void arrangement();
 		template<typename T>
 		void child(const std::string &);
+		void constraint(Layout::ConstraintType, const std::string &);
+		void expand(bool, bool);
+		void gravity(int, int);
+		void grid(unsigned);
+		void layout();
 		void panel(const std::string &);
 	};
 
+private:
+	template<typename T>
+	class ArrangedLoader: public DataFile::Loader
+	{
+	private:
+		typename T::Loader arr_loader;
+
+	public:
+		ArrangedLoader(Loader &, T &);
+	};
+
 protected:
 	Layout *layout;