X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpanel.cpp;h=f0c1c7c69f0f120b2d2696a049b75a3d975d3ed4;hb=91997dd3189b93a67179822ec2fed5f2a7bddb74;hp=59553b45de0122136a4c410ebf06a50ed378f6e4;hpb=0af3c2393bd00f39db3bfaf5b78a7a44f0fd5ff1;p=libs%2Fgltk.git diff --git a/source/panel.cpp b/source/panel.cpp index 59553b4..f0c1c7c 100644 --- a/source/panel.cpp +++ b/source/panel.cpp @@ -25,15 +25,11 @@ using namespace std; namespace Msp { namespace GLtk { -Panel::Panel(const Resources &r): - Widget(r), - Container(r), +Panel::Panel(): pointer_focus(0), pointer_grabbed(false), input_focus(0) -{ - update_style(); -} +{ } void Panel::raise(Widget &wdg) { @@ -193,7 +189,7 @@ Panel::Loader::Loader(Panel &p, map &m): template void Panel::Loader::child(const string &n) { - RefPtr chl = new T(pnl.res); + RefPtr chl = new T(); load_sub(*chl); pnl.add(*chl.get()); wdg_map[n] = chl.release(); @@ -201,7 +197,7 @@ void Panel::Loader::child(const string &n) void Panel::Loader::panel(const string &n) { - RefPtr p = new Panel(pnl.res); + RefPtr p = new Panel(); load_sub(*p, wdg_map); pnl.add(*p.get()); wdg_map[n] = p.release();