Improve Dialog staleness checks

Buttons may be activated by a navigation event.  There's now a protected
function that derived classes can call if they implement custom mechanisms
for producing a response.

diff --git a/source/dialog.cpp b/source/dialog.cpp
index 0b22e9874a8d1578266fe6b98a95ddca84cf3cc5..a264fbe87ce753de12b4b7c89ba76d5a849f2fa9 100644 (file)
--- a/source/dialog.cpp
+++ b/source/dialog.cpp
@@ -31,15 +31,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 +55,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)

diff --git a/source/dialog.h b/source/dialog.h
index 10519b178928c495bf022ba3d0a8e40487599c5f..e910085ca19af8c0ae3c0cd49f927827ebcf6fe1 100644 (file)
--- a/source/dialog.h
+++ b/source/dialog.h
@@ -43,8 +43,10 @@ public:
 
        virtual void button_release(int, int, unsigned);
        virtual bool key_release(unsigned, unsigned);
+       virtual bool navigate(Navigation);
 protected:
        void response(int);
+       void check_stale();
 
        /** Called when an action button is pressed. */
        virtual void on_response(int) { }