From 489867550409603c1b9d704acb60b52ef05122b5 Mon Sep 17 00:00:00 2001
From: Stephen Anthony <sa666666@gmail.com>
Date: Fri, 17 May 2019 21:53:59 -0230
Subject: [PATCH] Fix warnings, and compile failure for libretro.

---
 src/emucore/FrameBuffer.cxx          | 4 ++--
 src/gui/StellaSettingsDialog.cxx     | 4 ++--
 src/gui/StellaSettingsDialog.hxx     | 9 +++------
 src/libretro/FrameBufferLIBRETRO.hxx | 8 ++++++++
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/emucore/FrameBuffer.cxx b/src/emucore/FrameBuffer.cxx
index 86c6b6901..bfb469886 100644
--- a/src/emucore/FrameBuffer.cxx
+++ b/src/emucore/FrameBuffer.cxx
@@ -48,6 +48,7 @@
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 FrameBuffer::FrameBuffer(OSystem& osystem)
   : myOSystem(osystem),
+    myNumDisplays(1),
     myInitializedCount(0),
     myPausedCount(0),
     myStatsEnabled(false),
@@ -55,8 +56,7 @@ FrameBuffer::FrameBuffer(OSystem& osystem)
     myGrabMouse(false),
     myHiDPIAllowed(false),
     myHiDPIEnabled(false),
-    myCurrentModeList(nullptr),
-    myNumDisplays(1)
+    myCurrentModeList(nullptr)
 {
 }
 
diff --git a/src/gui/StellaSettingsDialog.cxx b/src/gui/StellaSettingsDialog.cxx
index f71e519b2..e768fcc33 100644
--- a/src/gui/StellaSettingsDialog.cxx
+++ b/src/gui/StellaSettingsDialog.cxx
@@ -114,10 +114,10 @@ void StellaSettingsDialog::addUIOptions(WidgetArray& wid, int& xpos, int& ypos,
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-void StellaSettingsDialog::addVideoOptions(WidgetArray& wid, int& xpos, int& ypos, const GUI::Font& font)
+void StellaSettingsDialog::addVideoOptions(WidgetArray& wid, int& xpos, int& ypos,
+                                           const GUI::Font& font)
 {
   const int VGAP = 4;
-  const int INDENT = 20;
   const int lineHeight = font.getLineHeight(),
     fontWidth = font.getMaxCharWidth();
   VariantList items;
diff --git a/src/gui/StellaSettingsDialog.hxx b/src/gui/StellaSettingsDialog.hxx
index d820fbb2e..12cc19234 100644
--- a/src/gui/StellaSettingsDialog.hxx
+++ b/src/gui/StellaSettingsDialog.hxx
@@ -24,13 +24,11 @@ class PopUpWidget;
 #include "Menu.hxx"
 #include "Dialog.hxx"
 #include "MessageBox.hxx"
-// FIXME - use the R77 define in the final release
-//         use the '1' define for testing
+
 #if defined(RETRON77)
-// #if 1
-#include "R77HelpDialog.hxx"
+  #include "R77HelpDialog.hxx"
 #else
-#include "HelpDialog.hxx"
+  #include "HelpDialog.hxx"
 #endif
 
 namespace GUI {
@@ -77,7 +75,6 @@ class StellaSettingsDialog : public Dialog
     PopUpWidget*      myTVMode;
 
     // TV scanline intensity
-    StaticTextWidget* myTVScanlines;
     SliderWidget*     myTVScanIntense;
 
     // TV phosphor effect
diff --git a/src/libretro/FrameBufferLIBRETRO.hxx b/src/libretro/FrameBufferLIBRETRO.hxx
index 2b2c96c80..aa4824a9a 100644
--- a/src/libretro/FrameBufferLIBRETRO.hxx
+++ b/src/libretro/FrameBufferLIBRETRO.hxx
@@ -124,6 +124,14 @@ class FrameBufferLIBRETRO : public FrameBuffer
     */
     Int32 getCurrentDisplayIndex() override { return 0; }
 
+    /**
+      This method is called to query the current window position.
+
+      @param x  The x-position retrieved
+      @param y  The y-position retrieved
+    */
+    void getCurrentWindowPos(int&, int&) override { }
+
     /**
       This method is called to change to the given video mode.