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

Fix harmless g++ 4.3 warning about suggested parentheses.

Browse Source 
Add parentheses around && within ||.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64110 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-04-22 14:16:18 +00:00
parent 6dfe3a3aee
commit a34ce03d63
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
utils/screenshotgen/src/autocapture.cpp
View File

@@ -279,7 +279,7 @@ bool AutoCaptureMechanism::Union(wxBitmap* top, wxBitmap* bottom, wxBitmap* resu
wxRect AutoCaptureMechanism::GetRect(wxWindow* ctrl, int flag) wxRect AutoCaptureMechanism::GetRect(wxWindow* ctrl, int flag)
{ {
if( !(m_flag & AJ_DisableRegionAdjust) && (flag & AJ_RegionAdjust) if( (!(m_flag & AJ_DisableRegionAdjust) && (flag & AJ_RegionAdjust))
|| (m_flag & AJ_AlwaysRegionAdjust) ) || (m_flag & AJ_AlwaysRegionAdjust) )
{ {
wxWindow * parent = ctrl->GetParent(); wxWindow * parent = ctrl->GetParent();