From 53338ce6ef323618291670de4d94593b47e21f27 Mon Sep 17 00:00:00 2001 From: Stephen Anthony Date: Wed, 29 Jul 2020 13:19:43 -0230 Subject: [PATCH] Fix compile errors in gcc/clang. --- src/gui/AboutDialog.cxx | 5 +++++ src/gui/AboutDialog.hxx | 2 +- src/gui/WhatsNewDialog.cxx | 3 +-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/gui/AboutDialog.cxx b/src/gui/AboutDialog.cxx index bca95061c..db088d923 100644 --- a/src/gui/AboutDialog.cxx +++ b/src/gui/AboutDialog.cxx @@ -89,6 +89,11 @@ AboutDialog::AboutDialog(OSystem& osystem, DialogContainer& parent, addToFocusList(wid); } +// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +AboutDialog::~AboutDialog() +{ +} + // The following commands can be put at the start of a line (all subject to change): // \C, \L, \R -- set center/left/right alignment // \c0 - \c5 -- set a custom color: diff --git a/src/gui/AboutDialog.hxx b/src/gui/AboutDialog.hxx index ecba48d41..fd3ad0a4c 100644 --- a/src/gui/AboutDialog.hxx +++ b/src/gui/AboutDialog.hxx @@ -32,7 +32,7 @@ class AboutDialog : public Dialog public: AboutDialog(OSystem& osystem, DialogContainer& parent, const GUI::Font& font); - virtual ~AboutDialog() = default; + virtual ~AboutDialog(); private: void handleCommand(CommandSender* sender, int cmd, int data, int id) override; diff --git a/src/gui/WhatsNewDialog.cxx b/src/gui/WhatsNewDialog.cxx index cda4b4b5c..bb2414a1d 100644 --- a/src/gui/WhatsNewDialog.cxx +++ b/src/gui/WhatsNewDialog.cxx @@ -26,8 +26,7 @@ WhatsNewDialog::WhatsNewDialog(OSystem& osystem, DialogContainer& parent, const int max_w, int max_h) : Dialog(osystem, parent, font, "What's New in Stella " + string(STELLA_VERSION) + "?") { - const int lineHeight = _font.getLineHeight(), - fontHeight = _font.getFontHeight(), + const int fontHeight = _font.getFontHeight(), fontWidth = _font.getMaxCharWidth(), buttonHeight = _font.getLineHeight() * 1.25; const int VGAP = fontHeight / 4;