Use std::unique_ptr for managing memory

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

diff --git a/source/dialog.cpp b/source/dialog.cpp
index 0b22e9874a8d1578266fe6b98a95ddca84cf3cc5..9f9fc20d15388f69ece201db0105265ddae7c74e 100644 (file)
--- a/source/dialog.cpp
+++ b/source/dialog.cpp
@@ -6,10 +6,6 @@ using namespace std;
 namespace Msp {
 namespace GLtk {
 
-Dialog::Dialog():
-       stale(false)
-{ }
-
 void Dialog::add_button(Button &button, int code)
 {
        add(button);
@@ -31,15 +27,20 @@ void Dialog::set_modal(bool m)
 void Dialog::button_release(int x, int y, unsigned button)
 {
        Panel::button_release(x, y, button);
-       if(stale)
-               delete this;
+       check_stale();
 }
 
 bool Dialog::key_release(unsigned key, unsigned mod)
 {
        bool result = Panel::key_release(key, mod);
-       if(stale)
-               delete this;
+       check_stale();
+       return result;
+}
+
+bool Dialog::navigate(Navigation nav)
+{
+       bool result = Panel::navigate(nav);
+       check_stale();
        return result;
 }
 
@@ -50,6 +51,12 @@ void Dialog::response(int code)
        stale = true;
 }
 
+void Dialog::check_stale()
+{
+       if(stale)
+               delete this;
+}
+
 
 Dialog::Loader::Loader(Dialog &d, WidgetMap &wm):
        DerivedObjectLoader<Dialog, Panel::Loader>(d, wm)
@@ -59,7 +66,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();