X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fdialog.cpp;h=5f63dcf75ed519fbf52c65e723422304fe395234;hb=6d9570c97584758e3cfcac6827d439b7fb844cf4;hp=7b47b66e9571c80800ae9bcd152fd0e1ea06b250;hpb=6d73e04329fc3752552773e4d11d7374caf779f6;p=libs%2Fgltk.git

diff --git a/source/dialog.cpp b/source/dialog.cpp
index 7b47b66..5f63dcf 100644
--- a/source/dialog.cpp
+++ b/source/dialog.cpp
@@ -6,28 +6,41 @@ using namespace std;
 namespace Msp {
 namespace GLtk {
 
-Dialog::Dialog():
-	stale(false)
-{ }
-
 void Dialog::add_button(Button &button, int code)
 {
 	add(button);
 	button.signal_clicked.connect(sigc::bind(sigc::mem_fun(this, &Dialog::response), code));
 }
 
+void Dialog::set_modal(bool m)
+{
+	if(m)
+	{
+		set_focus();
+		if(state&FOCUS)
+			signal_grab_pointer.emit();
+	}
+	else
+		signal_ungrab_pointer.emit();
+}
+
 void Dialog::button_release(int x, int y, unsigned button)
 {
 	Panel::button_release(x, y, button);
-	if(stale)
-		delete this;
+	check_stale();
 }
 
 bool Dialog::key_release(unsigned key, unsigned mod)
 {
 	bool result = Panel::key_release(key, mod);
-	if(stale)
-		delete this;
+	check_stale();
+	return result;
+}
+
+bool Dialog::navigate(Navigation nav)
+{
+	bool result = Panel::navigate(nav);
+	check_stale();
 	return result;
 }
 
@@ -38,6 +51,12 @@ void Dialog::response(int code)
 	stale = true;
 }
 
+void Dialog::check_stale()
+{
+	if(stale)
+		delete this;
+}
+
 
 Dialog::Loader::Loader(Dialog &d, WidgetMap &wm):
 	DerivedObjectLoader<Dialog, Panel::Loader>(d, wm)