Don't bother with creating intermediate steps for state updates

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

diff --git a/source/designer/toolbar.cpp b/source/designer/toolbar.cpp
index 559d8c3e9e13636c07d0dcbfcf34f266e813d8d0..f970607fc054b97879950dda94179c5db6c1e818 100644 (file)
--- a/source/designer/toolbar.cpp
+++ b/source/designer/toolbar.cpp
@@ -8,7 +8,8 @@ Toolbar::Toolbar(const string &name):
        expanded(true)
 {
        set_focusable(false);
-       set_layout(new GLtk::Row);
+       set_layout(new GLtk::Layout);
+       GLtk::Row row(*layout);
        layout->set_margin(GLtk::Sides(6, 10));
        layout->set_column_spacing(10);
 
@@ -21,7 +22,9 @@ Toolbar::Toolbar(const string &name):
 
        add(*(pnl_content = new GLtk::Panel));
        pnl_content->set_style("group");
-       GLtk::Layout *content_layout = new GLtk::Row;
+       GLtk::Layout *content_layout = new GLtk::Layout;
+       // XXX This needs to get deleted somehow
+       new GLtk::Row(*content_layout);
        pnl_content->set_layout(content_layout);
        content_layout->set_margin(0);
 }