compilation warnings fixed

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14285 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/volume.cpp b/src/msw/volume.cpp
index 11fcf168e51ae81397c38bd06ea4843daddf32e2..dacb7542a257fcbf07ec5482231c0da8f2684e78 100644 (file)
--- a/src/msw/volume.cpp
+++ b/src/msw/volume.cpp
@@ -410,8 +410,7 @@ wxArrayString wxFSVolume::GetVolumes(int flagsSet, int flagsUnset)
         wxArrayString nn;
         if (BuildRemoteList(nn, 0, flagsSet, flagsUnset))
         {
         wxArrayString nn;
         if (BuildRemoteList(nn, 0, flagsSet, flagsUnset))
         {

-            int idx;
-            for (idx = 0; idx < nn.GetCount(); idx++)
+            for (size_t 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());
-
-    if (type >= m_icons.GetCount())
-    {
-        wxLogError(_("Invalid request for icon type!"));
-        wxIcon null;
-        return null;
-    }
+    wxCHECK_MSG( type >= 0 && (size_t)type < m_icons.GetCount(),
+                 wxIcon(),                 
+                 _T("invalid icon index") );

 
     // Load on demand.
     if (m_icons[type].IsNull())
 
     // Load on demand.
     if (m_icons[type].IsNull())