Put braces around all calls to wxLogFunctions() inside an if statement.
This suppresses all the remaining g++ -Wparentheses warnings and uses consistent style everywhere. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61475 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -118,7 +118,9 @@ UINT GetMenuState(HMENU hMenu, UINT id, UINT flags)
|
||||
info.fMask = MIIM_STATE;
|
||||
// MF_BYCOMMAND is zero so test MF_BYPOSITION
|
||||
if ( !::GetMenuItemInfo(hMenu, id, flags & MF_BYPOSITION ? TRUE : FALSE , & info) )
|
||||
{
|
||||
wxLogLastError(wxT("GetMenuItemInfo"));
|
||||
}
|
||||
return info.fState;
|
||||
}
|
||||
#endif // __WXWINCE__
|
||||
@@ -569,7 +571,9 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
|
||||
mi.fMask = MIM_STYLE;
|
||||
mi.dwStyle = MNS_CHECKORBMP;
|
||||
if ( !(*pfnSetMenuInfo)(GetHmenu(), &mi) )
|
||||
{
|
||||
wxLogLastError(_T("SetMenuInfo(MNS_NOCHECK)"));
|
||||
}
|
||||
}
|
||||
|
||||
// tell the item that it's not really owner-drawn but only
|
||||
@@ -1446,9 +1450,13 @@ bool wxMenuBar::AddAdornments(long style)
|
||||
if (style & wxCLOSE_BOX)
|
||||
{
|
||||
if (!CommandBar_AddAdornments((HWND) m_commandBar, 0, 0))
|
||||
{
|
||||
wxLogLastError(wxT("CommandBar_AddAdornments"));
|
||||
}
|
||||
else
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
Reference in New Issue
Block a user