Refactor Dialog to separate the autodeletion functionality

[libs/gltk.git] / source / dialog.cpp

diff --git a/source/dialog.cpp b/source/dialog.cpp
index 5f63dcf75ed519fbf52c65e723422304fe395234..5e5e390e7cadadf91d3e5af4e978d4e3f333dc33 100644 (file)
--- a/source/dialog.cpp
+++ b/source/dialog.cpp
@@ -24,37 +24,11 @@ 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);
-       check_stale();
-}
-
-bool Dialog::key_release(unsigned key, unsigned mod)
-{
-       bool result = Panel::key_release(key, mod);
-       check_stale();
-       return result;
-}
-
-bool Dialog::navigate(Navigation nav)
-{
-       bool result = Panel::navigate(nav);
-       check_stale();
-       return result;
-}
-
 void Dialog::response(int code)
 {
        on_response(code);
        signal_response.emit(code);
-       stale = true;
-}
-
-void Dialog::check_stale()
-{
-       if(stale)
-               delete this;
+       set_visible(false);
 }
 
 
@@ -66,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();