X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpanel.h;h=3061032789574f168c2bb2933f787d4f439c1284;hb=HEAD;hp=ce4b2a740073dc2b2eb743578d1631e38e477f67;hpb=d10d1de6d17c285c63d7b3cea549017aaa1ddb01;p=libs%2Fgltk.git

diff --git a/source/panel.h b/source/panel.h
index ce4b2a7..3061032 100644
--- a/source/panel.h
+++ b/source/panel.h
@@ -1,6 +1,7 @@
 #ifndef MSP_GLTK_PANEL_H_
 #define MSP_GLTK_PANEL_H_
 
+#include <memory>
 #include <msp/core/typeregistry.h>
 #include "container.h"
 #include "layout.h"
@@ -36,7 +37,6 @@ public:
 		Loader(Panel &, WidgetMap &);
 
 	private:
-		Layout &get_layout();
 		Widget &get_last_widget();
 		template<typename T>
 		void arrangement();
@@ -46,7 +46,7 @@ public:
 		void expand(bool, bool);
 		void ghost(bool);
 		void gravity(int, int);
-		void grid(unsigned);
+		void grid(std::size_t);
 		void layout();
 		template<typename T>
 		void unnamed_child();
@@ -67,24 +67,20 @@ private:
 
 protected:
 	std::vector<Widget *> nav_order;
-	Layout *layout = nullptr;
+	std::unique_ptr<Layout> layout;
 
 	static TypeRegistry<Loader::AddChildType, Loader &> widget_registry;
 	static bool widget_registry_init_done;
 
-	Panel(const Panel &);
-	Panel &operator=(const Panel &);
 public:
 	Panel();
-	virtual ~Panel();
 
 	template<typename T>
 	static void register_child_type(const std::string &);
 
 	const char *get_class() const override { return "panel"; }
 
-	void set_layout(Layout *);
-	Layout *get_layout() { return layout; }
+	Layout &get_or_create_layout();
 
 protected:
 	void autosize_special(const Part &, Geometry &) const override;
@@ -119,10 +115,11 @@ void Panel::Loader::child(const std::string &n)
 template<typename T>
 void Panel::Loader::unnamed_child()
 {
-	RefPtr<T> chl = new T();
+	std::unique_ptr<T> chl = std::make_unique<T>();
 	load_sub(*chl);
-	obj.add(*chl.get());
-	last_widget = chl.release();
+	Widget *wdg = chl.get();
+	obj.add(move(chl));
+	last_widget = wdg;
 }