X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Finput.cpp;h=acfa8bd00dd7e8041ba4633daee7c7b34ac85baa;hb=9f0d428e974defa64cdf8e7b7072967327250958;hp=18b14a573bcad9754407c00525abc482b468c37e;hpb=d32eab21ebacb78500dc46af5b5a6354a9a37fe2;p=r2c2.git

diff --git a/source/designer/input.cpp b/source/designer/input.cpp
index 18b14a5..acfa8bd 100644
--- a/source/designer/input.cpp
+++ b/source/designer/input.cpp
@@ -1,7 +1,8 @@
 #include <GL/gl.h>
 #include <msp/gl/texture.h>
 #include <msp/gltk/button.h>
-#include <msp/gltk/mixedrows.h>
+#include <msp/gltk/column.h>
+#include <msp/gltk/row.h>
 #include <msp/input/keys.h>
 #include "designer.h"
 #include "input.h"
@@ -12,27 +13,27 @@ using namespace Msp;
 InputDialog::InputDialog(Designer &d, const string &title, const string &text):
 	designer(d)
 {
-	GLtk::MixedRows *rows = new GLtk::MixedRows;
-	set_layout(rows);
+	set_layout(new GLtk::Layout);
+	GLtk::Column col(*layout);
 
 	GLtk::Label *lbl;
 	add(*(lbl=new GLtk::Label(title)));
-	layout->set_expand(*lbl, true, false);
 	lbl->set_style("title");
 
-	rows->start_row();
 	add(*(entry=new GLtk::Entry(text)));
 	entry->set_edit_size(60, 1);
 
 	GLtk::Button *btn;
 
-	rows->start_row();
-	rows->split_columns();
-	add_button(*(btn=new GLtk::Button("Cncl")), 0);
-	btn->set_style("red");
+	{
+		GLtk::Row row(*layout);
+		row.split();
+		add_button(*(btn=new GLtk::Button("Cncl")), 0);
+		btn->set_style("red");
 
-	add_button(*(btn=new GLtk::Button("OK")), 1);
-	btn->set_style("green");
+		add_button(*(btn=new GLtk::Button("OK")), 1);
+		btn->set_style("green");
+	}
 
 	entry->set_focus();
 }