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

Fixed some minor warning picked up by clang++. 

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2720 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2013-05-06 15:45:43 +00:00
parent 76294492b4
commit 2bc7b72b7f
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/Dialog.cxx
View File

@ -703,7 +703,7 @@ Dialog::TabFocus::~TabFocus()
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void Dialog::TabFocus::appendFocusList(WidgetArray& list)
{
uInt32 active = widget->getActiveTab();
int active = widget->getActiveTab();
if(active >= 0 && active < focus.size())
list.push_back(focus[active].list);
@ -712,7 +712,7 @@ void Dialog::TabFocus::appendFocusList(WidgetArray& list)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void Dialog::TabFocus::saveCurrentFocus(Widget* w)
{
if(currentTab >= 0 && currentTab < focus.size() &&
if(currentTab < focus.size() &&
Widget::isWidgetInChain(focus[currentTab].list, w))
focus[currentTab].widget = w;
}
@ -722,6 +722,5 @@ Widget* Dialog::TabFocus::getNewFocus()
{
currentTab = widget->getActiveTab();
return (currentTab >= 0 && currentTab < focus.size()) ?
focus[currentTab].widget : 0;
return (currentTab < focus.size()) ? focus[currentTab].widget : 0;
}