X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fengineer%2Frouteselect.cpp;h=47259e3ba4b6b27e745743beb0411aab1c1161ba;hb=d15ac13f2e170f155b4bbd124df48400c339b644;hp=cd1e7042e846b730ca180b71a96efe4ff21e5f29;hpb=e13742268b7030f8d6152858d39f1c6b43f94c88;p=r2c2.git

diff --git a/source/engineer/routeselect.cpp b/source/engineer/routeselect.cpp
index cd1e704..47259e3 100644
--- a/source/engineer/routeselect.cpp
+++ b/source/engineer/routeselect.cpp
@@ -1,32 +1,23 @@
-/* $Id$
-
-This file is part of the MSP Märklin suite
-Copyright © 2009 Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #include <msp/gltk/label.h>
 #include "engineer.h"
-#include "libmarklin/route.h"
+#include "libr2c2/route.h"
 #include "routeselect.h"
 
 using namespace std;
 using namespace Msp;
-using namespace Marklin;
+using namespace R2C2;
 
-RouteSelect::RouteSelect(Engineer &e, const GLtk::Resources &r, Train &t):
-	GLtk::Widget(r),
-	Dialog(r),
+RouteSelect::RouteSelect(Engineer &e, Train &t):
 	engineer(e),
 	train(t)
 {
 	set_size(200, 95);
 
 	GLtk::Label *label;
-	add(*(label = new GLtk::Label(res, "Select route")));
+	add(*(label = new GLtk::Label("Select route")));
 	label->set_geometry(GLtk::Geometry(10, geom.h-25, geom.w-20, 20));
 
-	add(*(drp_route = new GLtk::Dropdown(res)));
+	add(*(drp_route = new GLtk::Dropdown));
 	drp_route->set_geometry(GLtk::Geometry(10, geom.h-50, geom.w-20, 20));
 	drp_route->append("(none)");
 	drp_route->set_selected_index(0);