X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcontainer.h;h=a0cba3b776f8ffe3fce88443775bff461304d85b;hb=83f553a382ce554951594de85e4fd7b854305463;hp=f16a9ba5d814b1e21841bdf0b18c4e49cc8a2a79;hpb=5bb0cc92a28a7862571249a2512bcd23ed272344;p=libs%2Fgltk.git

diff --git a/source/container.h b/source/container.h
index f16a9ba..a0cba3b 100644
--- a/source/container.h
+++ b/source/container.h
@@ -4,26 +4,26 @@
 #include <list>
 #include <stdexcept>
 #include <sigc++/trackable.h>
+#include "mspgltk_api.h"
 #include "widget.h"
 
 namespace Msp {
 namespace GLtk {
 
-class hierarchy_error: public std::logic_error
+class MSPGLTK_API hierarchy_error: public std::logic_error
 {
 public:
 	hierarchy_error(const std::string &);
-	virtual ~hierarchy_error() throw() { }
 };
 
 
-class Container: virtual public Widget
+class MSPGLTK_API Container: virtual public Widget
 {
 protected:
 	struct Child: public sigc::trackable
 	{
 		Container &container;
-		Widget *widget;
+		Widget *widget = nullptr;
 		Time::TimeDelta time_since_animate;
 
 		Child(Container &, Widget *);
@@ -34,18 +34,20 @@ protected:
 		void grab_pointer();
 		void ungrab_pointer();
 		void request_animation(const Time::TimeDelta &);
+		void rebuild_needed();
 	};
 
 	std::list<Child *> children;
-	Widget *click_focus;
-	unsigned click_button;
-	Widget *pointer_focus;
-	bool pointer_grabbed;
-	Widget *input_focus;
-	Widget *saved_input_focus;
-	Widget *touch_focus;
-
-	Container();
+	Widget *click_focus = nullptr;
+	unsigned click_button = 0;
+	Widget *pointer_focus = nullptr;
+	bool pointer_grabbed = false;
+	Widget *input_focus = nullptr;
+	Widget *saved_input_focus = nullptr;
+	Widget *touch_focus = nullptr;
+	bool children_rebuild_needed = false;
+
+	Container() = default;
 public:
 	virtual ~Container();
 
@@ -63,7 +65,7 @@ public:
 	void raise(Widget &);
 
 protected:
-	void set_pointer_focus(Widget *);
+	void set_pointer_focus(Widget *, bool = false);
 	void set_input_focus(Widget *);
 public:
 	Widget *get_input_focus() const { return input_focus; }
@@ -72,6 +74,9 @@ public:
 private:
 	void check_animation_interval();
 
+protected:
+	virtual void rebuild_hierarchy();
+
 public:
 	virtual void button_press(int, int, unsigned);
 	virtual void button_release(int, int, unsigned);