X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdialog.cpp;h=5e5e390e7cadadf91d3e5af4e978d4e3f333dc33;hb=b4d0a86b77fb5146f5a4f6c76690c16204210f1a;hp=7b47b66e9571c80800ae9bcd152fd0e1ea06b250;hpb=6d73e04329fc3752552773e4d11d7374caf779f6;p=libs%2Fgltk.git

diff --git a/source/dialog.cpp b/source/dialog.cpp
index 7b47b66..5e5e390 100644
--- a/source/dialog.cpp
+++ b/source/dialog.cpp
@@ -6,36 +6,29 @@ 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));
 }
 
-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::set_modal(bool m)
 {
-	bool result = Panel::key_release(key, mod);
-	if(stale)
-		delete this;
-	return result;
+	if(m)
+	{
+		set_focus();
+		if(state&FOCUS)
+			signal_grab_pointer.emit();
+	}
+	else
+		signal_ungrab_pointer.emit();
 }
 
 void Dialog::response(int code)
 {
 	on_response(code);
 	signal_response.emit(code);
-	stale = true;
+	set_visible(false);
 }
 
 
@@ -47,7 +40,7 @@ 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();