X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpanel.cpp;h=ac277a98ae1bfaa4b4823fd0ffe83401f2d73eb4;hb=3fb1cc7fe7ffa3948af1a81d1cac91d1313b2452;hp=9373ff2ebd7559fecccc0e058a140a1c647ca55a;hpb=c435423919a20a87d100e1ee4cd1fc6ce223040c;p=libs%2Fgltk.git

diff --git a/source/panel.cpp b/source/panel.cpp
index 9373ff2..ac277a9 100644
--- a/source/panel.cpp
+++ b/source/panel.cpp
@@ -5,8 +5,10 @@ Copyright © 2007  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
+#include <algorithm>
 #include <msp/core/refptr.h>
 #include "button.h"
+#include "dropdown.h"
 #include "entry.h"
 #include "hslider.h"
 #include "indicator.h"
@@ -14,6 +16,8 @@ Distributed under the LGPL
 #include "list.h"
 #include "panel.h"
 #include "part.h"
+#include "table.h"
+#include "toggle.h"
 #include "vslider.h"
 
 using namespace std;
@@ -47,11 +51,26 @@ void Panel::remove(Widget &wdg)
 	ChildSeq::iterator i=find(children.begin(), children.end(), &wdg);
 	if(i!=children.end())
 	{
+		if(&wdg==pointer_focus)
+			set_pointer_focus(0, 0);
+		if(&wdg==input_focus)
+			set_input_focus(0);
+
 		set_parent(wdg, 0);
 		children.erase(i);
 	}
 }
 
+void Panel::raise(Widget &wdg)
+{
+	ChildSeq::iterator i=find(children.begin(), children.end(), &wdg);
+	if(i!=children.end())
+	{
+		children.erase(i);
+		children.push_back(&wdg);
+	}
+}
+
 void Panel::button_press(int x, int y, unsigned btn)
 {
 	if(pointer_grab>0)
@@ -139,6 +158,22 @@ void Panel::child_hidden(Widget &wdg)
 		set_pointer_focus(0, 0);
 }
 
+void Panel::grab_pointer(Widget &wdg)
+{
+	if(pointer_grab==0 || pointer_focus==&wdg)
+		set_pointer_focus(&wdg, 255);
+	else
+		throw InvalidState("Pointer is already grabbed");
+}
+
+void Panel::ungrab_pointer(Widget &wdg)
+{
+	if(pointer_focus==&wdg)
+		set_pointer_focus(0, 0);
+	else if(pointer_grab>0)
+		throw Exception("Someone is trying to steal the pointer!");
+}
+
 void Panel::render_special(const Part &part) const
 {
 	if(part.get_name()=="children")
@@ -197,14 +232,17 @@ Panel::Loader::Loader(Panel &p, map<string, Widget *> &m):
 	pnl(p),
 	wdg_map(m)
 {
-	add("button", &Loader::child<Button>);
-	add("entry",  &Loader::child<Entry>);
-	add("hslider", &Loader::child<HSlider>);
+	add("button",    &Loader::child<Button>);
+	add("dropdown",  &Loader::child<Dropdown>);
+	add("entry",     &Loader::child<Entry>);
+	add("hslider",   &Loader::child<HSlider>);
 	add("indicator", &Loader::child<Indicator>);
-	add("label",  &Loader::child<Label>);
-	add("list",   &Loader::child<List>);
-	add("panel",  &Loader::panel);
-	add("vslider", &Loader::child<VSlider>);
+	add("label",     &Loader::child<Label>);
+	add("list",      &Loader::child<List>);
+	add("panel",     &Loader::panel);
+	add("table",     &Loader::child<Table>);
+	add("toggle",    &Loader::child<Toggle>);
+	add("vslider",   &Loader::child<VSlider>);
 }
 
 template<typename T>