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

Enable a few extra compiler checks in the Linux build script, 

and fix a few warnings that gcc caught and clang missed.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3210 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2015-09-20 01:13:53 +00:00
parent ef5f1bad4d
commit 82f413cfe5
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -49,7 +49,7 @@ ifdef CXXFLAGS
else else
CXXFLAGS:= -O2 CXXFLAGS:= -O2
endif endif
CXXFLAGS+= -Wall CXXFLAGS+= -Wall -Wextra -Wno-unused-parameter -Wno-ignored-qualifiers
ifdef HAVE_GCC ifdef HAVE_GCC
CXXFLAGS+= -Wno-multichar -Wunused -fno-rtti -Woverloaded-virtual -Wnon-virtual-dtor -std=c++11 CXXFLAGS+= -Wno-multichar -Wunused -fno-rtti -Woverloaded-virtual -Wnon-virtual-dtor -std=c++11
endif endif

2
src/gui/EditTextWidget.cxx
View File

@ -84,7 +84,7 @@ void EditTextWidget::drawWidget(bool hilite)
// Draw the text // Draw the text
adjustOffset(); adjustOffset();
s.drawString(_font, editString(), _x + 2, _y + 2, getEditRect().width(), s.drawString(_font, editString(), _x + 2, _y + 2, getEditRect().width(),
!_changed ? _textcolor : kDbgChangedTextColor, !_changed ? _textcolor : uInt32(kDbgChangedTextColor),
kTextAlignLeft, -_editScrollOffset, false); kTextAlignLeft, -_editScrollOffset, false);
// Draw the caret // Draw the caret

2
src/gui/PopUpWidget.cxx
View File

@ -147,7 +147,7 @@ void PopUpWidget::drawWidget(bool hilite)
// Draw the label, if any // Draw the label, if any
if (_labelWidth > 0) if (_labelWidth > 0)
s.drawString(_font, _label, _x, _y + myTextY, _labelWidth, s.drawString(_font, _label, _x, _y + myTextY, _labelWidth,
isEnabled() ? _textcolor : kColor, kTextAlignRight); isEnabled() ? _textcolor : uInt32(kColor), kTextAlignRight);
// Draw a thin frame around us. // Draw a thin frame around us.
s.hLine(x, _y, x + w - 1, kColor); s.hLine(x, _y, x + w - 1, kColor);

4
src/gui/Widget.cxx
View File

@ -331,7 +331,7 @@ void StaticTextWidget::drawWidget(bool hilite)
{ {
FBSurface& s = _boss->dialog().surface(); FBSurface& s = _boss->dialog().surface();
s.drawString(_font, _label, _x, _y, _w, s.drawString(_font, _label, _x, _y, _w,
isEnabled() ? _textcolor : kColor, _align); isEnabled() ? _textcolor : uInt32(kColor), _align);
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@ -397,7 +397,7 @@ void ButtonWidget::drawWidget(bool hilite)
{ {
FBSurface& s = _boss->dialog().surface(); FBSurface& s = _boss->dialog().surface();
s.drawString(_font, _label, _x, _y + (_h - _fontHeight)/2 + 1, _w, s.drawString(_font, _label, _x, _y + (_h - _fontHeight)/2 + 1, _w,
!isEnabled() ? kColor : hilite ? _textcolorhi : _textcolor, _align); !isEnabled() ? uInt32(kColor) : hilite ? _textcolorhi : _textcolor, _align);
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -