From 6e7f8176edfeee4689cbd43b15f27e433e12d47c Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Thu, 26 Nov 2020 08:24:02 +0100
Subject: [PATCH] Update to latest libopenui

---
 radio/src/gui/colorlcd/fullscreen_dialog.cpp | 5 +++--
 radio/src/gui/colorlcd/fullscreen_dialog.h   | 2 +-
 radio/src/gui/colorlcd/page.cpp              | 5 +++--
 radio/src/gui/colorlcd/page.h                | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/radio/src/gui/colorlcd/fullscreen_dialog.cpp b/radio/src/gui/colorlcd/fullscreen_dialog.cpp
index a57537beb..bb211e31d 100644
--- a/radio/src/gui/colorlcd/fullscreen_dialog.cpp
+++ b/radio/src/gui/colorlcd/fullscreen_dialog.cpp
@@ -113,9 +113,10 @@ void FullScreenDialog::checkEvents()
   }
 }
 
-void FullScreenDialog::deleteLater(bool detach)
+void FullScreenDialog::deleteLater(bool detach, bool trash)
 {
 #if defined(HARDWARE_KEYS)
+  #warning "TODO remove previousFocus from here, and use layers"
   if (previousFocus) {
     previousFocus->setFocus(SET_FOCUS_DEFAULT);
   }
@@ -125,7 +126,7 @@ void FullScreenDialog::deleteLater(bool detach)
     running = false;
   }
   else {
-    Window::deleteLater(detach);
+    Window::deleteLater(detach, trash);
   }
 }
 
diff --git a/radio/src/gui/colorlcd/fullscreen_dialog.h b/radio/src/gui/colorlcd/fullscreen_dialog.h
index 1215c7ee1..0eb236eef 100644
--- a/radio/src/gui/colorlcd/fullscreen_dialog.h
+++ b/radio/src/gui/colorlcd/fullscreen_dialog.h
@@ -59,7 +59,7 @@ class FullScreenDialog : public FormGroup
     bool onTouchEnd(coord_t x, coord_t y) override;
 #endif
 
-    void deleteLater(bool detach=true) override;
+    void deleteLater(bool detach = true, bool trash = true) override;
 
     void checkEvents() override;
 
diff --git a/radio/src/gui/colorlcd/page.cpp b/radio/src/gui/colorlcd/page.cpp
index 02dede8b6..fe7e51524 100644
--- a/radio/src/gui/colorlcd/page.cpp
+++ b/radio/src/gui/colorlcd/page.cpp
@@ -67,13 +67,14 @@ Page::~Page()
 #endif
 }
 
-void Page::deleteLater(bool detach)
+void Page::deleteLater(bool detach, bool trash)
 {
+  #warning "TODO remove previousFocus and use layers"
   if (previousFocus) {
     previousFocus->setFocus(SET_FOCUS_DEFAULT);
   }
 
-  Window::deleteLater(detach);
+  Window::deleteLater(detach, trash);
 }
 
 void Page::paint(BitmapBuffer * dc)
diff --git a/radio/src/gui/colorlcd/page.h b/radio/src/gui/colorlcd/page.h
index 00eb087c3..15d2a38db 100644
--- a/radio/src/gui/colorlcd/page.h
+++ b/radio/src/gui/colorlcd/page.h
@@ -78,7 +78,7 @@ class Page: public Window {
     }
 #endif
 
-    void deleteLater(bool detach=true) override;
+    void deleteLater(bool detach = true, bool trash = true) override;
 
     void paint(BitmapBuffer * dc) override;