From: Mikko Rasa <tdb@tdb.fi>
Date: Wed, 9 Dec 2009 09:53:34 +0000 (+0000)
Subject: Adapt to a change in gltk
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=a73b245826e8c1bc1f1394e9aa21618f8f31a6c5;hp=444c7efb2fadb10e98197a62b791829d821370c0;p=r2c2.git

Adapt to a change in gltk
---

diff --git a/source/designer/input.cpp b/source/designer/input.cpp
index 42cc078..b0e1251 100644
--- 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 46994a0..09c025a 100644
--- 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 dd4d3f9..08348d7 100644
--- 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 7c3ba71..a01df55 100644
--- 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 d26cec0..67a9579 100644
--- 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)