X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdialog.cpp;h=7b47b66e9571c80800ae9bcd152fd0e1ea06b250;hb=db2a069cd5ec4c8809c2ba6ddeec2ddcd32d49ef;hp=3e09783dcb5eb36350d4c4158b9139ae33ed7fd0;hpb=0af3c2393bd00f39db3bfaf5b78a7a44f0fd5ff1;p=libs%2Fgltk.git

diff --git a/source/dialog.cpp b/source/dialog.cpp
index 3e09783..7b47b66 100644
--- a/source/dialog.cpp
+++ b/source/dialog.cpp
@@ -1,19 +1,12 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2010  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include "button.h"
 #include "dialog.h"
 
+using namespace std;
+
 namespace Msp {
 namespace GLtk {
 
-Dialog::Dialog(const Resources &r):
-	Widget(r),
-	Panel(r),
+Dialog::Dialog():
 	stale(false)
 { }
 
@@ -30,11 +23,12 @@ void Dialog::button_release(int x, int y, unsigned button)
 		delete this;
 }
 
-void Dialog::key_release(unsigned key, unsigned mod)
+bool Dialog::key_release(unsigned key, unsigned mod)
 {
-	Panel::key_release(key, mod);
+	bool result = Panel::key_release(key, mod);
 	if(stale)
 		delete this;
+	return result;
 }
 
 void Dialog::response(int code)
@@ -44,5 +38,20 @@ void Dialog::response(int code)
 	stale = true;
 }
 
+
+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