suppress some warnings appearing in the optimized build only
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13085 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -195,12 +195,17 @@ bool wxICOHandler::SaveFile(wxImage *image,
|
|||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
wxUint32 m_Size = cStream.GetSize();
|
wxUint32 m_Size = cStream.GetSize();
|
||||||
|
|
||||||
|
// wxCountingOutputStream::Ok() always returns TRUE for now and this
|
||||||
|
// "if" provokes VC++ warnings in optimized build
|
||||||
|
#if 0
|
||||||
if (!cStream.Ok())
|
if (!cStream.Ok())
|
||||||
{
|
{
|
||||||
if (verbose)
|
if (verbose)
|
||||||
wxLogError( _("ICO: Error calculating size of DIB .") );
|
wxLogError( _("ICO: Error calculating size of DIB .") );
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
#endif // 0
|
||||||
|
|
||||||
m_offset = m_offset + sizeof(ICONDIRENTRY) ;
|
m_offset = m_offset + sizeof(ICONDIRENTRY) ;
|
||||||
|
|
||||||
|
@@ -300,14 +300,12 @@ bool wxIniConfig::DoReadString(const wxString& szKey, wxString *pstr) const
|
|||||||
GetProfileString(m_strGroup, strKey, "", szBuf, WXSIZEOF(szBuf));
|
GetProfileString(m_strGroup, strKey, "", szBuf, WXSIZEOF(szBuf));
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( ::IsEmpty(szBuf) ) {
|
if ( ::IsEmpty(szBuf) )
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
|
||||||
else {
|
|
||||||
*pstr = szBuf;
|
*pstr = szBuf;
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
bool wxIniConfig::DoReadLong(const wxString& szKey, long *pl) const
|
bool wxIniConfig::DoReadLong(const wxString& szKey, long *pl) const
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user