X-Git-Url: http://git.tdb.fi/?p=libs%2Fgltk.git;a=blobdiff_plain;f=source%2Fdialog.cpp;fp=source%2Fdialog.cpp;h=fed9c859f0003ae73e63542e5a0a011b6d0a3485;hp=5e5e390e7cadadf91d3e5af4e978d4e3f333dc33;hb=3ac64a18ea1825174b84adb8570368df51e66231;hpb=72de2dce79c76da9931e6bc80e59743526cc18fe

diff --git a/source/dialog.cpp b/source/dialog.cpp
index 5e5e390..fed9c85 100644
--- a/source/dialog.cpp
+++ b/source/dialog.cpp
@@ -9,7 +9,21 @@ namespace GLtk {
 void Dialog::add_button(Button &button, int code)
 {
 	add(button);
-	button.signal_clicked.connect(sigc::bind(sigc::mem_fun(this, &Dialog::response), code));
+	connect_button(button, code);
+}
+
+void Dialog::add_button(unique_ptr<Button> button, int code)
+{
+	Button &b = *button;
+	add(move(button));
+	connect_button(b, code);
+}
+
+Button &Dialog::add_button(const string &text, int code)
+{
+	Button &b = add_new<Button>(text);
+	connect_button(b, code);
+	return b;
 }
 
 void Dialog::set_modal(bool m)
@@ -24,6 +38,11 @@ void Dialog::set_modal(bool m)
 		signal_ungrab_pointer.emit();
 }
 
+void Dialog::connect_button(Button &button, int code)
+{
+	button.signal_clicked.connect(sigc::bind(sigc::mem_fun(this, &Dialog::response), code));
+}
+
 void Dialog::response(int code)
 {
 	on_response(code);
@@ -42,8 +61,9 @@ void Dialog::Loader::action_button(const string &n, int c)
 {
 	unique_ptr<Button> btn = make_unique<Button>();
 	load_sub(*btn);
-	obj.add_button(*btn.get(), c);
-	last_widget = wdg_map[n] = btn.release();
+	Widget *wdg = btn.get();
+	obj.add_button(move(btn), c);
+	last_widget = wdg_map[n] = wdg;
 }
 
 } // namespace GLtk