Framework for supporting multiple control protocols in a single driver

[r2c2.git] / source / designer / toolbar.cpp

diff --git a/source/designer/toolbar.cpp b/source/designer/toolbar.cpp
index 629205c6ce89cba05f2f2b77eaaf1583e6cd99f8..56a5d6de7e3ac09a30396cc5d1c83913d47cc1cc 100644 (file)
--- a/source/designer/toolbar.cpp
+++ b/source/designer/toolbar.cpp
@@ -16,8 +16,6 @@ using namespace Msp;
 using namespace Marklin;
 
 Toolbar::Toolbar(Designer &d):
-       GLtk::Widget(d.get_ui_resources()),
-       GLtk::Panel(d.get_ui_resources()),
        designer(d)
 {
        set_size(640, 40);
@@ -25,56 +23,56 @@ Toolbar::Toolbar(Designer &d):
        GLtk::Button *btn;
        GLtk::Label *lbl;
 
-       add(*(btn=new GLtk::Button(res, "Load")));
+       add(*(btn=new GLtk::Button("Load")));
        btn->set_geometry(GLtk::Geometry(5, 10, 40, 24));
        btn->set_tooltip("Load layout (not implemented)");
 
-       add(*(btn=new GLtk::Button(res, "Save")));
+       add(*(btn=new GLtk::Button("Save")));
        btn->set_geometry(GLtk::Geometry(45, 10, 40, 24));
        btn->set_tooltip("Save current layout");
        btn->signal_clicked.connect(sigc::mem_fun(&designer, &Designer::save));
 
-       add(*(btn=new GLtk::Button(res, "Quit")));
+       add(*(btn=new GLtk::Button("Quit")));
        btn->set_geometry(GLtk::Geometry(85, 10, 40, 24));
        btn->set_style("red");
        btn->set_tooltip("Exit Designer");
        btn->signal_clicked.connect(sigc::mem_fun(&designer, &Designer::quit));
 
-       add(*(btn=new GLtk::Button(res, "+Trk")));
+       add(*(btn=new GLtk::Button("+Trk")));
        btn->set_geometry(GLtk::Geometry(135, 10, 40, 24));
        btn->set_tooltip("Add a track piece");
        btn->signal_clicked.connect(sigc::mem_fun(&designer, &Designer::new_track));
 
-       add(*(btn=new GLtk::Button(res, "Trnt")));
+       add(*(btn=new GLtk::Button("Trnt")));
        btn->set_geometry(GLtk::Geometry(175, 10, 40, 24));
        btn->set_tooltip("Set turnout ID of selected track");
        btn->signal_clicked.connect(sigc::mem_fun(&designer, &Designer::set_turnout_id));
 
-       add(*(btn=new GLtk::Button(res, "Sens")));
+       add(*(btn=new GLtk::Button("Sens")));
        btn->set_geometry(GLtk::Geometry(215, 10, 40, 24));
        btn->set_tooltip("Set sensor ID of selected tracks");
        btn->signal_clicked.connect(sigc::mem_fun(&designer, &Designer::set_sensor_id));
 
-       add(*(lbl=new GLtk::Label(res, "Routes:")));
+       add(*(lbl=new GLtk::Label("Routes:")));
        lbl->set_geometry(GLtk::Geometry(265, 22, 40, 13));
 
-       add(*(drp_routes=new GLtk::Dropdown(res)));
+       add(*(drp_routes=new GLtk::Dropdown));
        drp_routes->set_geometry(GLtk::Geometry(265, 5, 250, 17));
        drp_routes->set_tooltip("Select route to edit");
        drp_routes->append("(new route)");
        drp_routes->signal_item_selected.connect(sigc::mem_fun(this, &Toolbar::route_selected));
 
-       add(*(btn=new GLtk::Button(res, "Del")));
+       add(*(btn=new GLtk::Button("Del")));
        btn->set_geometry(GLtk::Geometry(515, 10, 40, 24));
        btn->set_tooltip("Delete the current route");
        btn->signal_clicked.connect(sigc::mem_fun(this, &Toolbar::delete_route_clicked));
 
-       add(*(btn=new GLtk::Button(res, "Name")));
+       add(*(btn=new GLtk::Button("Name")));
        btn->set_geometry(GLtk::Geometry(555, 10, 40, 24));
        btn->set_tooltip("Rename the current route");
        btn->signal_clicked.connect(sigc::mem_fun(&designer, &Designer::rename_route));
 
-       add(*(btn=new GLtk::Button(res, "Add")));
+       add(*(btn=new GLtk::Button("Add")));
        btn->set_geometry(GLtk::Geometry(595, 10, 40, 24));
        btn->set_tooltip("Add selected tracks to current route");
        btn->signal_clicked.connect(sigc::mem_fun(&designer, &Designer::add_selection_to_route));