X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdialog.cpp;h=fed9c859f0003ae73e63542e5a0a011b6d0a3485;hb=3ac64a18ea1825174b84adb8570368df51e66231;hp=0b22e9874a8d1578266fe6b98a95ddca84cf3cc5;hpb=9ef9547b31544637aca600ac65107d5b8028c39a;p=libs%2Fgltk.git

diff --git a/source/dialog.cpp b/source/dialog.cpp
index 0b22e98..fed9c85 100644
--- a/source/dialog.cpp
+++ b/source/dialog.cpp
@@ -6,14 +6,24 @@ using namespace std;
 namespace Msp {
 namespace GLtk {
 
-Dialog::Dialog():
-	stale(false)
-{ }
-
 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)
@@ -28,26 +38,16 @@ void Dialog::set_modal(bool m)
 		signal_ungrab_pointer.emit();
 }
 
-void Dialog::button_release(int x, int y, unsigned button)
-{
-	Panel::button_release(x, y, button);
-	if(stale)
-		delete this;
-}
-
-bool Dialog::key_release(unsigned key, unsigned mod)
+void Dialog::connect_button(Button &button, int code)
 {
-	bool result = Panel::key_release(key, mod);
-	if(stale)
-		delete this;
-	return result;
+	button.signal_clicked.connect(sigc::bind(sigc::mem_fun(this, &Dialog::response), code));
 }
 
 void Dialog::response(int code)
 {
 	on_response(code);
 	signal_response.emit(code);
-	stale = true;
+	set_visible(false);
 }
 
 
@@ -59,10 +59,11 @@ Dialog::Loader::Loader(Dialog &d, WidgetMap &wm):
 
 void Dialog::Loader::action_button(const string &n, int c)
 {
-	RefPtr<Button> btn = new Button();
+	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