mirror of https://github.com/stella-emu/stella.git
Fix warnings, and compile failure for libretro.
This commit is contained in:
parent
6fc3863ef9
commit
22b15d7f37
|
@ -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)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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.
|
||||
|
||||
|
|
Loading…
Reference in New Issue