Match the API change in GLtk

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

diff --git a/source/engineer/trainproperties.cpp b/source/engineer/trainproperties.cpp
index bb8860b96ff12ffc8253344a88a168e484a1da35..bf0b270ca3de41556e3219fd81ea3ee73f70dc71 100644 (file)
--- a/source/engineer/trainproperties.cpp
+++ b/source/engineer/trainproperties.cpp
@@ -17,22 +17,20 @@ using namespace std;
 using namespace Msp;
 using namespace Marklin;
 
-TrainProperties::TrainProperties(Engineer &e, const GLtk::Resources &r, Train *t):
-       Widget(r),
-       Dialog(r),
+TrainProperties::TrainProperties(Engineer &e, Train *t):
        engineer(e),
        train(t)
 {
        set_size(250, 305);
 
        GLtk::Label *label;
-       add(*(label = new GLtk::Label(res, "Train properties")));
+       add(*(label = new GLtk::Label("Train properties")));
        label->set_geometry(GLtk::Geometry(10, geom.h-25, geom.w-20, 20));
 
-       add(*(ent_addr = new GLtk::Entry(res)));
+       add(*(ent_addr = new GLtk::Entry));
        ent_addr->set_geometry(GLtk::Geometry(10, geom.h-50, 40, 20));
 
-       add(*(drp_type = new GLtk::Dropdown(res)));
+       add(*(drp_type = new GLtk::Dropdown));
        drp_type->set_geometry(GLtk::Geometry(60, geom.h-50, geom.w-70, 20));
 
        const Catalogue::VehicleMap &vehs = engineer.get_catalogue().get_vehicles();
@@ -49,10 +47,10 @@ TrainProperties::TrainProperties(Engineer &e, const GLtk::Resources &r, Train *t
                ++n;
        }
 
-       add(*(ent_name = new GLtk::Entry(res)));
+       add(*(ent_name = new GLtk::Entry));
        ent_name->set_geometry(GLtk::Geometry(10, geom.h-75, geom.w-20, 20));
 
-       add(*(drp_priority = new GLtk::Dropdown(res)));
+       add(*(drp_priority = new GLtk::Dropdown));
        drp_priority->set_geometry(GLtk::Geometry(10, geom.h-100, geom.w-20, 20));
        drp_priority->append("Standard freight");
        drp_priority->append("Express freight");
@@ -60,16 +58,16 @@ TrainProperties::TrainProperties(Engineer &e, const GLtk::Resources &r, Train *t
        drp_priority->append("Standard passenger");
        drp_priority->append("Express passenger");
 
-       add(*(lst_vehicles = new GLtk::List(res)));
+       add(*(lst_vehicles = new GLtk::List));
        lst_vehicles->set_geometry(GLtk::Geometry(10, 100, geom.w-20, geom.h-205));
 
        GLtk::Button *btn;
 
-       add(*(btn = new GLtk::Button(res, "Rem")));
+       add(*(btn = new GLtk::Button("Rem")));
        btn->set_geometry(GLtk::Geometry(10, 70, 40, 25));
        btn->signal_clicked.connect(sigc::mem_fun(this, &TrainProperties::remove_vehicle_clicked));
 
-       add(*(drp_new_vehicle = new GLtk::Dropdown(res)));
+       add(*(drp_new_vehicle = new GLtk::Dropdown));
        drp_new_vehicle->set_geometry(GLtk::Geometry(10, 45, geom.w-20, 20));
        drp_new_vehicle->append("(new vehicle)");
        drp_new_vehicle->set_selected_index(0);