ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix warnings from clang.

This commit is contained in:
Stephen Anthony 2019-05-05 11:43:31 -02:30
parent 092c064a26
commit 46acb0c98b
4 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/Dialog.cxx
View File

@ -60,12 +60,12 @@ Dialog::Dialog(OSystem& instance, DialogContainer& parent, const GUI::Font& font
_processCancel(false), _processCancel(false),
_title(title), _title(title),
_th(0), _th(0),
_layer(0),
_surface(nullptr), _surface(nullptr),
_tabID(0), _tabID(0),
_flags(Widget::FLAG_ENABLED | Widget::FLAG_BORDER | Widget::FLAG_CLEARBG), _flags(Widget::FLAG_ENABLED | Widget::FLAG_BORDER | Widget::FLAG_CLEARBG),
_max_w(0), _max_w(0),
_max_h(0), _max_h(0)
_layer(0)
{ {
setTitle(title); setTitle(title);
setDirty(); setDirty();

7
src/gui/R77HelpDialog.cxx
View File

@ -97,10 +97,13 @@ void R77HelpDialog::loadConfig()
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void R77HelpDialog::updateStrings(uInt8 page, uInt8 lines, string& title) void R77HelpDialog::updateStrings(uInt8 page, uInt8 lines, string& title)
{ {
// FIXME - this currently isn't used
#if 0
#ifdef BSPF_MACOS #ifdef BSPF_MACOS
#define ALT_ "Cmd" #define ALT_ "Cmd"
#else #else
#define ALT_ "Alt" #define ALT_ "Alt"
#endif
#endif #endif
int i = 0; int i = 0;

14
src/gui/StellaSettingsDialog.cxx
View File

@ -24,23 +24,13 @@
#include "PopUpWidget.hxx" #include "PopUpWidget.hxx"
#include "MessageBox.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"
#else
#include "HelpDialog.hxx"
#endif
#include "StellaSettingsDialog.hxx" #include "StellaSettingsDialog.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
StellaSettingsDialog::StellaSettingsDialog(OSystem& osystem, DialogContainer& parent, StellaSettingsDialog::StellaSettingsDialog(OSystem& osystem, DialogContainer& parent,
const GUI::Font& font, int max_w, int max_h, Menu::AppMode mode) const GUI::Font& font, int max_w, int max_h, Menu::AppMode mode)
: Dialog(osystem, parent, font, "Basic settings"), : Dialog(osystem, parent, font, "Basic settings"),
myMode(mode), myMode(mode)
myHelpDialog(nullptr)
{ {
const int VBORDER = 8; const int VBORDER = 8;
const int HBORDER = 10; const int HBORDER = 10;
@ -516,4 +506,4 @@ void StellaSettingsDialog::openHelp()
myHelpDialog = make_unique<HelpDialog>(instance(), parent(), _font); myHelpDialog = make_unique<HelpDialog>(instance(), parent(), _font);
#endif #endif
myHelpDialog->open(); myHelpDialog->open();
} }

3
src/gui/StellaSettingsDialog.hxx
View File

@ -68,9 +68,6 @@ class StellaSettingsDialog : public Dialog
void openHelp(); void openHelp();
private: private:
// advanced settings mode:
ButtonWidget* myAdvancedSettings;
// UI theme // UI theme
PopUpWidget* myThemePopup; PopUpWidget* myThemePopup;
PopUpWidget* myPositionPopup; PopUpWidget* myPositionPopup;