Fix a segfault in removing vehicles when creating a new train

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

diff --git a/source/engineer/timetabledialog.cpp b/source/engineer/timetabledialog.cpp
index 1c7c907d25959904f5dc326a345a058af50f12b9..52f391ce0a85f635d6854fdab66b806ad49f458a 100644 (file)
--- a/source/engineer/timetabledialog.cpp
+++ b/source/engineer/timetabledialog.cpp
@@ -14,29 +14,27 @@ using namespace std;
 using namespace Msp;
 using namespace Marklin;
 
-TimetableDialog::TimetableDialog(const GLtk::Resources &r, Timetable &tt):
-       GLtk::Widget(r),
-       GLtk::Dialog(r),
+TimetableDialog::TimetableDialog(Timetable &tt):
        timetable(tt)
 {
        set_size(250, 200);
 
        GLtk::Button *btn;
 
-       add_button(*(btn = new GLtk::Button(res, "Cncl")), 0);
+       add_button(*(btn = new GLtk::Button("Cncl")), 0);
        btn->set_geometry(GLtk::Geometry(geom.w-80, 10, 30, 25));
        btn->set_style("red");
 
-       add_button(*(btn = new GLtk::Button(res, "OK")), 1);
+       add_button(*(btn = new GLtk::Button("OK")), 1);
        btn->set_geometry(GLtk::Geometry(geom.w-40, 10, 30, 25));
        btn->set_style("green");
 
-       add(*(tgl_enabled = new GLtk::Toggle(res, "On")));
+       add(*(tgl_enabled = new GLtk::Toggle("On")));
        tgl_enabled->set_geometry(GLtk::Geometry(10, 10, 40, 27));
        tgl_enabled->set_value(timetable.is_enabled());
        tgl_enabled->signal_toggled.connect(sigc::mem_fun(this, &TimetableDialog::enabled_toggled));
 
-       add(*(ent_timetable = new GLtk::Entry(res)));
+       add(*(ent_timetable = new GLtk::Entry));
        ent_timetable->set_geometry(GLtk::Geometry(10, 45, geom.w-20, geom.h-55));
        ent_timetable->set_style("multiline");
        ent_timetable->set_multiline(true);