Rename the project to R²C²

[r2c2.git] / source / engineer / routeselect.cpp

diff --git a/source/engineer/routeselect.cpp b/source/engineer/routeselect.cpp
index 6cda460c810652b42b5adb89641f6093ffe347fd..00bf6cfdcd19cf79d97c316df2def12be7c24785 100644 (file)
--- a/source/engineer/routeselect.cpp
+++ b/source/engineer/routeselect.cpp
@@ -1,32 +1,30 @@
 /* $Id$
 
-This file is part of the MSP Märklin suite
+This file is part of R²C²
 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);
@@ -60,7 +58,8 @@ void RouteSelect::on_ok_clicked()
                        ++i;
                }
                
-               train.set_route(*i);
+               if(!train.set_route(*i))
+                       engineer.set_status("Could not set route");
        }
        else
                train.set_route(0);