X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Ftrainview.cpp;h=df336d577197763080a68fca2360f97fc52c6d52;hb=62ce775d9af8f3321dbdebd6243b551fbbb0b976;hp=af2243c92fd2a5e41c1669d38a255e3f2a514f29;hpb=4513d00658c453b49d49bdfa97ec0ce67f576475;p=r2c2.git

diff --git a/source/engineer/trainview.cpp b/source/engineer/trainview.cpp
index af2243c..df336d5 100644
--- a/source/engineer/trainview.cpp
+++ b/source/engineer/trainview.cpp
@@ -17,8 +17,6 @@ using namespace Msp;
 using namespace Marklin;
 
 TrainView::TrainView(Engineer &e, const Train &t):
-	GLtk::Widget(e.get_ui_resources()),
-	GLtk::Panel(e.get_ui_resources()),
 	engineer(e),
 	train(t),
 	mode(SIDE),
@@ -47,29 +45,29 @@ TrainView::TrainView(Engineer &e, const Train &t):
 	pass->lighting = &engineer.get_lighting();
 
 	GLtk::Image *image;
-	add(*(image = new GLtk::Image(res, &tex)));
+	add(*(image = new GLtk::Image(&tex)));
 	image->set_geometry(GLtk::Geometry(10, 40, geom.w-20, geom.h-50));
 
 	GLtk::Button *btn;
 
-	add(*(btn = new GLtk::Button(res, "Roof")));
+	add(*(btn = new GLtk::Button("Roof")));
 	btn->set_geometry(GLtk::Geometry(10, 10, 36, 25));
 	btn->signal_clicked.connect(sigc::bind(sigc::mem_fun(this, &TrainView::set_mode), ROOF));
 
-	add(*(btn = new GLtk::Button(res, "Side")));
+	add(*(btn = new GLtk::Button("Side")));
 	btn->set_geometry(GLtk::Geometry(46, 10, 36, 25));
 	btn->signal_clicked.connect(sigc::bind(sigc::mem_fun(this, &TrainView::set_mode), SIDE));
 
-	add(*(btn = new GLtk::Button(res, "Head")));
+	add(*(btn = new GLtk::Button("Head")));
 	btn->set_geometry(GLtk::Geometry(82, 10, 36, 25));
 	btn->signal_clicked.connect(sigc::bind(sigc::mem_fun(this, &TrainView::set_mode), HEAD));
 
-	add(*(tgl_forward = new GLtk::Toggle(res, "Fwd")));
+	add(*(tgl_forward = new GLtk::Toggle("Fwd")));
 	tgl_forward->set_geometry(GLtk::Geometry(118, 8, 36, 27));
 	tgl_forward->set_value(true);
 	tgl_forward->signal_toggled.connect(sigc::mem_fun(this, &TrainView::set_forward));
 
-	add(*(btn = new GLtk::Button(res, "Close")));
+	add(*(btn = new GLtk::Button("Close")));
 	btn->set_geometry(GLtk::Geometry(geom.w-46, 10, 36, 25));
 	btn->signal_clicked.connect(sigc::mem_fun(this, &TrainView::close_clicked));