X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Froot.cpp;h=6bc5793df6e0c4b5140660a9f96f8d3095e58c5f;hb=8a0058b5b90bb7e9eacf1646142f4d73b426fd66;hp=224e5bc30ef3a975fb022da83a6ba19e4be64779;hpb=48fd4db84c4d0b43305d85f74de99eb4fef04fd6;p=libs%2Fgltk.git diff --git a/source/root.cpp b/source/root.cpp index 224e5bc..6bc5793 100644 --- a/source/root.cpp +++ b/source/root.cpp @@ -1,16 +1,18 @@ /* $Id$ This file is part of libmspgltk -Copyright © 2007 Mikko Rasa, Mikkosoft Productions +Copyright © 2007-2009 Mikko Rasa, Mikkosoft Productions Distributed under the LGPL */ +#include #include "root.h" namespace Msp { namespace GLtk { -Root::Root(Resources &r, Graphics::Window &w): +Root::Root(const Resources &r, Graphics::Window &w): + Widget(r), Panel(r), window(w) { @@ -55,13 +57,13 @@ void Root::pointer_motion_event(int x, int y) void Root::key_press_event(unsigned key, unsigned mod, wchar_t ch) { if(visible) - key_press(key, mod, ch); + key_press(Input::key_from_sys(key), mod, ch); } void Root::key_release_event(unsigned key, unsigned mod) { if(visible) - key_release(key, mod); + key_release(Input::key_from_sys(key), mod); } void Root::translate_coords(int &x, int &y)