Adapt to a change in gltk

diff --git a/source/designer/input.cpp b/source/designer/input.cpp
index 42cc0783dd994f72c75d6db755a19cfb9950ea74..b0e12515fa92d7d80dc129101e4119ab3570a2c7 100644 (file)
--- a/source/designer/input.cpp
+++ b/source/designer/input.cpp
@@ -16,7 +16,8 @@ using namespace std;
 using namespace Msp;
 
 ::Input::Input(Designer &d, const string &title, const string &text):
-       Panel(d.get_ui_resources()),
+       GLtk::Widget(d.get_ui_resources()),
+       GLtk::Panel(d.get_ui_resources()),
        designer(d)
 {
        set_size(300, 100);

diff --git a/source/designer/toolbar.cpp b/source/designer/toolbar.cpp
index 46994a081ca0e9b1ac7b207c2b80610d38a3a6c9..09c025a7f05dfe37ba209b5d430203d7a477990e 100644 (file)
--- a/source/designer/toolbar.cpp
+++ b/source/designer/toolbar.cpp
@@ -15,6 +15,7 @@ using namespace Msp;
 using namespace Marklin;
 
 Toolbar::Toolbar(Designer &d):
+       GLtk::Widget(d.get_ui_resources()),
        GLtk::Panel(d.get_ui_resources()),
        designer(d)
 {

diff --git a/source/engineer/mainpanel.cpp b/source/engineer/mainpanel.cpp
index dd4d3f9e70e2512208de4a2c006e8353f83fedba..08348d713a91982902c9122067f6d6b017732801 100644 (file)
--- a/source/engineer/mainpanel.cpp
+++ b/source/engineer/mainpanel.cpp
@@ -13,6 +13,7 @@ using namespace std;
 using namespace Msp;
 
 MainPanel::MainPanel(Engineer &e, GLtk::Resources &r):
+       Widget(r),
        Panel(r),
        engineer(e)
 {

diff --git a/source/engineer/trainpanel.cpp b/source/engineer/trainpanel.cpp
index 7c3ba71a5c8e1cf83cebe85d9b64f8c400cc5a4a..a01df557c0c1fe3f126defd63c65a9443ba8d8d4 100644 (file)
--- a/source/engineer/trainpanel.cpp
+++ b/source/engineer/trainpanel.cpp
@@ -16,6 +16,7 @@ using namespace Msp;
 using namespace Marklin;
 
 TrainPanel::TrainPanel(Engineer &e, const GLtk::Resources &r, Train &t):
+       Widget(r),
        Panel(r),
        engineer(e),
        train(t)

diff --git a/source/engineer/trainproperties.cpp b/source/engineer/trainproperties.cpp
index d26cec08b649524606f23c232bf2e98d28a10fc7..67a957959fca96c04a8b8ab9338d7f62933b5e24 100644 (file)
--- a/source/engineer/trainproperties.cpp
+++ b/source/engineer/trainproperties.cpp
@@ -16,6 +16,7 @@ using namespace Msp;
 using namespace Marklin;
 
 TrainProperties::TrainProperties(Engineer &e, GLtk::Resources &r, Train *t):
+       Widget(r),
        Panel(r),
        engineer(e),
        train(t)