X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdialog.cpp;h=a264fbe87ce753de12b4b7c89ba76d5a849f2fa9;hb=bea19bdc0d51a2ebacb007b9503e851258fd148f;hp=cc4c1bf6a51f67cd1b00ecd46a9fc3cb2fda0c90;hpb=2b70e8801c43875ed3f4135bdd0141265cff0312;p=libs%2Fgltk.git

diff --git a/source/dialog.cpp b/source/dialog.cpp
index cc4c1bf..a264fbe 100644
--- a/source/dialog.cpp
+++ b/source/dialog.cpp
@@ -1,6 +1,8 @@
 #include "button.h"
 #include "dialog.h"
 
+using namespace std;
+
 namespace Msp {
 namespace GLtk {
 
@@ -14,18 +16,36 @@ void Dialog::add_button(Button &button, int code)
 	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();
 }
 
-void Dialog::key_release(unsigned key, unsigned mod)
+bool Dialog::key_release(unsigned key, unsigned mod)
 {
-	Panel::key_release(key, mod);
-	if(stale)
-		delete this;
+	bool result = Panel::key_release(key, mod);
+	check_stale();
+	return result;
+}
+
+bool Dialog::navigate(Navigation nav)
+{
+	bool result = Panel::navigate(nav);
+	check_stale();
+	return result;
 }
 
 void Dialog::response(int code)
@@ -35,5 +55,26 @@ 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)
+{
+	add("action_button", &Loader::action_button);
+}
+
+void Dialog::Loader::action_button(const string &n, int c)
+{
+	RefPtr<Button> btn = new Button();
+	load_sub(*btn);
+	obj.add_button(*btn.get(), c);
+	last_widget = wdg_map[n] = btn.release();
+}
+
 } // namespace GLtk
 } // namespace Msp