X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpanel.h;h=ab83de078bc17f595f8089112610c3f72fd8cb41;hb=103ceeace366c6d80fce323438b31b9bbc167915;hp=09096f75c0b06855d3879f517702cde14245b4a2;hpb=6deafc9f236b90175a303944815f7c0eac1c95c1;p=libs%2Fgltk.git

diff --git a/source/panel.h b/source/panel.h
index 09096f7..ab83de0 100644
--- a/source/panel.h
+++ b/source/panel.h
@@ -4,6 +4,7 @@
 #include <msp/core/typeregistry.h>
 #include "container.h"
 #include "layout.h"
+#include "mspgltk_api.h"
 
 namespace Msp {
 namespace GLtk {
@@ -13,7 +14,7 @@ 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
 ignored.
 */
-class Panel: public Container
+class MSPGLTK_API Panel: public Container
 {
 public:
 	class Loader: public DataFile::DerivedObjectLoader<Panel, Widget::Loader>
@@ -45,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();
@@ -66,13 +67,11 @@ private:
 
 protected:
 	std::vector<Widget *> nav_order;
-	Layout *layout;
+	Layout *layout = nullptr;
 
 	static TypeRegistry<Loader::AddChildType, Loader &> widget_registry;
 	static bool widget_registry_init_done;
 
-	Panel(const Panel &);
-	Panel &operator=(const Panel &);
 public:
 	Panel();
 	virtual ~Panel();
@@ -80,24 +79,24 @@ public:
 	template<typename T>
 	static void register_child_type(const std::string &);
 
-	virtual const char *get_class() const { return "panel"; }
+	const char *get_class() const override { return "panel"; }
 
 	void set_layout(Layout *);
 	Layout *get_layout() { return layout; }
 
 protected:
-	virtual void autosize_special(const Part &, Geometry &) const;
-	virtual void render_special(const Part &, GL::Renderer &) const;
+	void autosize_special(const Part &, Geometry &) const override;
+	void render_special(const Part &, GL::Renderer &) const override;
 
 public:
-	virtual bool navigate(Navigation);
+	bool navigate(Navigation) override;
 protected:
 	Widget *find_next_child(int, int, int, int, int) const;
 	static int compute_delta(int, int, int, int, int);
 
-	virtual void on_size_change();
-	virtual void on_child_added(Widget &);
-	virtual void on_child_removed(Widget &);
+	void on_size_change() override;
+	void on_child_added(Widget &) override;
+	void on_child_removed(Widget &) override;
 };