Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

VC++ release mode warning fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24156 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-10-12 01:46:17 +00:00
parent b26613c25b
commit a509f83054
3 changed files with 59 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/event.cpp
View File

@@ -562,8 +562,6 @@ bool wxMouseEvent::ButtonDClick(int but) const
case wxMOUSE_BTN_RIGHT: case wxMOUSE_BTN_RIGHT:
return RightDClick(); return RightDClick();
} }
return false;
} }
// return true if was a button down event // return true if was a button down event
@@ -587,8 +585,6 @@ bool wxMouseEvent::ButtonDown(int but) const
case wxMOUSE_BTN_RIGHT: case wxMOUSE_BTN_RIGHT:
return RightDown(); return RightDown();
} }
return false;
} }
// return true if was a button up event // return true if was a button up event
@@ -612,8 +608,6 @@ bool wxMouseEvent::ButtonUp(int but) const
case wxMOUSE_BTN_RIGHT: case wxMOUSE_BTN_RIGHT:
return RightUp(); return RightUp();
} }
return false;
} }
// return true if the given button is currently changing state // return true if the given button is currently changing state
@@ -639,8 +633,6 @@ bool wxMouseEvent::Button(int but) const
case wxMOUSE_BTN_RIGHT: case wxMOUSE_BTN_RIGHT:
return RightDown() || RightUp() || RightDClick(); return RightDown() || RightUp() || RightDClick();
} }
return false;
} }
bool wxMouseEvent::ButtonIsDown(int but) const bool wxMouseEvent::ButtonIsDown(int but) const
@@ -663,8 +655,6 @@ bool wxMouseEvent::ButtonIsDown(int but) const
case wxMOUSE_BTN_RIGHT: case wxMOUSE_BTN_RIGHT:
return RightIsDown(); return RightIsDown();
} }
return false;
} }
int wxMouseEvent::GetButton() const int wxMouseEvent::GetButton() const

9
src/common/intl.cpp
View File

@@ -672,13 +672,12 @@ wxPluralFormsNode*wxPluralFormsParser::logicalOrExpression()
rn->setNode(0, un.release()); rn->setNode(0, un.release());
return rn.release(); return rn.release();
} }
else
{
un->setNode(0, ln.release()); un->setNode(0, ln.release());
un->setNode(1, rn.release()); un->setNode(1, rn.release());
return un.release(); return un.release();
} }
}
return ln.release(); return ln.release();
} }
@@ -712,13 +711,11 @@ wxPluralFormsNode* wxPluralFormsParser::logicalAndExpression()
rn->setNode(0, un.release()); rn->setNode(0, un.release());
return rn.release(); return rn.release();
} }
else
{
un->setNode(0, ln.release()); un->setNode(0, ln.release());
un->setNode(1, rn.release()); un->setNode(1, rn.release());
return un.release(); return un.release();
} }
}
return ln.release(); return ln.release();
} }

4
src/html/helpdata.cpp
View File

@@ -596,8 +596,7 @@ bool wxHtmlHelpData::AddBook(const wxString& book)
return rt; return rt;
} }
else
{
wxFSFile *fi; wxFSFile *fi;
wxFileSystem fsys; wxFileSystem fsys;
@@ -650,7 +649,6 @@ bool wxHtmlHelpData::AddBook(const wxString& book)
delete fi; delete fi;
return rtval; return rtval;
} }
}
wxString wxHtmlHelpData::FindPageByName(const wxString& x) wxString wxHtmlHelpData::FindPageByName(const wxString& x)
{ {