Make keyboard event handlers indicate whether the event was handled

[libs/gltk.git] / source / dialog.cpp

diff --git a/source/dialog.cpp b/source/dialog.cpp
index 5eea60964ec3d694ff94b001cc8a7702473824d8..7b47b66e9571c80800ae9bcd152fd0e1ea06b250 100644 (file)
--- 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,18 +23,34 @@ 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)
 {
        on_response(code);
        signal_response.emit(code);
-       stale=true;
+       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