compilation warnings fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14285 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -410,8 +410,7 @@ wxArrayString wxFSVolume::GetVolumes(int flagsSet, int flagsUnset)
|
|||||||
wxArrayString nn;
|
wxArrayString nn;
|
||||||
if (BuildRemoteList(nn, 0, flagsSet, flagsUnset))
|
if (BuildRemoteList(nn, 0, flagsSet, flagsUnset))
|
||||||
{
|
{
|
||||||
int idx;
|
for (size_t idx = 0; idx < nn.GetCount(); idx++)
|
||||||
for (idx = 0; idx < nn.GetCount(); idx++)
|
|
||||||
list.Add(nn[idx]);
|
list.Add(nn[idx]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -537,14 +536,9 @@ int wxFSVolume::GetFlags() const
|
|||||||
//=============================================================================
|
//=============================================================================
|
||||||
wxIcon wxFSVolume::GetIcon(wxFSIconType type) const
|
wxIcon wxFSVolume::GetIcon(wxFSIconType type) const
|
||||||
{
|
{
|
||||||
wxASSERT(type < m_icons.GetCount());
|
wxCHECK_MSG( type >= 0 && (size_t)type < m_icons.GetCount(),
|
||||||
|
wxIcon(),
|
||||||
if (type >= m_icons.GetCount())
|
_T("invalid icon index") );
|
||||||
{
|
|
||||||
wxLogError(_("Invalid request for icon type!"));
|
|
||||||
wxIcon null;
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Load on demand.
|
// Load on demand.
|
||||||
if (m_icons[type].IsNull())
|
if (m_icons[type].IsNull())
|
||||||
|
Reference in New Issue
Block a user