Make use of the unified storage class for other parts of Layout

[r2c2.git] / source / designer / input.cpp

diff --git a/source/designer/input.cpp b/source/designer/input.cpp
index e2b0ae0e06a175f8215b8299248fd07709ddfd49..ea4129a9cab1948a9383857ad277aefdcb5bd7fa 100644 (file)
--- a/source/designer/input.cpp
+++ b/source/designer/input.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of the MSP Märklin suite
-Copyright © 2006-2008, 2010  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #include <GL/gl.h>
 #include <msp/gl/texture.h>
 #include <msp/gltk/button.h>
@@ -16,26 +9,24 @@ using namespace std;
 using namespace Msp;
 
 InputDialog::InputDialog(Designer &d, const string &title, const string &text):
-       GLtk::Widget(d.get_ui_resources()),
-       GLtk::Dialog(d.get_ui_resources()),
        designer(d)
 {
        set_size(300, 100);
 
        GLtk::Label *lbl;
-       add(*(lbl=new GLtk::Label(res, title)));
+       add(*(lbl=new GLtk::Label(title)));
        lbl->set_geometry(GLtk::Geometry(10, geom.h-30, geom.w-20, 20));
 
-       add(*(entry=new GLtk::Entry(res, text)));
+       add(*(entry=new GLtk::Entry(text)));
        entry->set_geometry(GLtk::Geometry(10, geom.h-60, geom.w-20, 20));
 
        GLtk::Button *btn;
 
-       add_button(*(btn=new GLtk::Button(res, "Cncl")), 0);
+       add_button(*(btn=new GLtk::Button("Cncl")), 0);
        btn->set_geometry(GLtk::Geometry(geom.w-90, 10, 40, 24));
        btn->set_style("red");
 
-       add_button(*(btn=new GLtk::Button(res, "OK")), 1);
+       add_button(*(btn=new GLtk::Button("OK")), 1);
        btn->set_geometry(GLtk::Geometry(geom.w-50, 10, 40, 24));
        btn->set_style("green");
 
@@ -45,14 +36,14 @@ InputDialog::InputDialog(Designer &d, const string &title, const string &text):
        entry->set_focus();
 }
 
-void InputDialog::key_press(unsigned key, unsigned mod, wchar_t ch)
+void InputDialog::key_press(unsigned key, unsigned mod)
 {
        if(key==Msp::Input::KEY_ENTER)
                response(1);
        else if(key==Msp::Input::KEY_ESC)
                response(0);
        else
-               Dialog::key_press(key, mod, ch);
+               Dialog::key_press(key, mod);
 }
 
 void InputDialog::on_response(int code)