From a34ce03d63c10f555a63d593b257080fc070a26d Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 22 Apr 2010 14:16:18 +0000 Subject: [PATCH] Fix harmless g++ 4.3 warning about suggested parentheses. Add parentheses around && within ||. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64110 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- utils/screenshotgen/src/autocapture.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/screenshotgen/src/autocapture.cpp b/utils/screenshotgen/src/autocapture.cpp index c425010e54..3977b036c7 100644 --- a/utils/screenshotgen/src/autocapture.cpp +++ b/utils/screenshotgen/src/autocapture.cpp @@ -279,7 +279,7 @@ bool AutoCaptureMechanism::Union(wxBitmap* top, wxBitmap* bottom, wxBitmap* resu 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) ) { wxWindow * parent = ctrl->GetParent(); -- 2.50.0