X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=examples%2Fwidgetdemo%2Fbuttondemo.cpp;h=871244ab8d6fd0f99e1e932b18bf218bdef2d080;hb=3ac64a18ea1825174b84adb8570368df51e66231;hp=f189056ded2c61353ec6fd86c7a34f61f101ae56;hpb=68c6a79c86c595fa2ec5a7109568d5baefc50afd;p=libs%2Fgltk.git

diff --git a/examples/widgetdemo/buttondemo.cpp b/examples/widgetdemo/buttondemo.cpp
index f189056..871244a 100644
--- a/examples/widgetdemo/buttondemo.cpp
+++ b/examples/widgetdemo/buttondemo.cpp
@@ -8,19 +8,17 @@ using namespace Msp;
 
 ButtonDemo::ButtonDemo()
 {
-	set_layout(new GLtk::Layout);
+	get_or_create_layout();
 
-	GLtk::Label *lbl_message = new GLtk::Label;
-	add(*lbl_message);
+	GLtk::Label *lbl_message = &add_new<GLtk::Label>();
 
 	vector<GLtk::Button *> buttons;
 	for(unsigned i=0; i<5; ++i)
 	{
 		string text = format("Button %d", i+1);
-		GLtk::Button *btn = new GLtk::Button(text);
+		GLtk::Button *btn = &add_new<GLtk::Button>(text);
 		btn->signal_clicked.connect(sigc::bind(sigc::mem_fun(lbl_message, &GLtk::Label::set_text), text+" was clicked"));
 		buttons.push_back(btn);
-		add(*btn);
 		if(i>0)
 		{
 			layout->add_constraint(*btn, GLtk::Layout::COPY_WIDTH, *buttons[0]);
@@ -41,10 +39,9 @@ ButtonDemo::ButtonDemo()
 
 	layout->add_constraint(*buttons[0], GLtk::Layout::BELOW, *lbl_message);
 
-	GLtk::Button *btn = new GLtk::Button("A big one");
+	GLtk::Button *btn = &add_new<GLtk::Button>("A big one");
 	btn->signal_clicked.connect(sigc::bind(sigc::mem_fun(lbl_message, &GLtk::Label::set_text), "The big button was clicked"));
 	buttons.push_back(btn);
-	add(*btn);
 	layout->add_constraint(*btn, GLtk::Layout::ALIGN_TOP, *buttons[0]);
 	layout->add_constraint(*btn, GLtk::Layout::ALIGN_BOTTOM, *buttons[1]);
 	layout->add_constraint(*btn, GLtk::Layout::ALIGN_LEFT, *buttons[3]);