Ensure there is valid context for DrawRectangle

[wxWidgets.git] / src / msw / volume.cpp

diff --git a/src/msw/volume.cpp b/src/msw/volume.cpp
index 5414ddb7ad1c091162c99f51b770dd1ff17e2988..06c454ebc9677b964cb392e5460618afcf96fb5e 100644 (file)
--- a/src/msw/volume.cpp
+++ b/src/msw/volume.cpp
@@ -506,12 +506,13 @@ bool wxFSVolumeBase::Create(const wxString& name)
     if (!rc)
     {
         wxLogError(_("Cannot read typename from '%s'!"), m_volName.c_str());
     if (!rc)
     {
         wxLogError(_("Cannot read typename from '%s'!"), m_volName.c_str());

-        return m_isOk;
+        return false;

     }
     m_dispName = fi.szDisplayName;
 
     // all tests passed.
     }
     m_dispName = fi.szDisplayName;
 
     // all tests passed.

-    return m_isOk = true;
+    m_isOk = true;
+    return true;

 } // Create
 
 //=============================================================================
 } // Create
 
 //=============================================================================


@@ -584,6 +585,7 @@ wxIcon wxFSVolume::GetIcon(wxFSIconType type) const
     wxCHECK_MSG( type >= 0 && (size_t)type < m_icons.GetCount(), wxNullIcon,
                  wxT("wxFSIconType::GetIcon(): invalid icon index") );
 
     wxCHECK_MSG( type >= 0 && (size_t)type < m_icons.GetCount(), wxNullIcon,
                  wxT("wxFSIconType::GetIcon(): invalid icon index") );
 

+#ifdef __WXMSW__

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


@@ -612,7 +614,7 @@ wxIcon wxFSVolume::GetIcon(wxFSIconType type) const
         }
 
         SHFILEINFO fi;
         }
 
         SHFILEINFO fi;

-        long rc = SHGetFileInfo(m_volName.wx_str(), 0, &fi, sizeof(fi), flags);
+        long rc = SHGetFileInfo(m_volName.t_str(), 0, &fi, sizeof(fi), flags);

         m_icons[type].SetHICON((WXHICON)fi.hIcon);
         if (!rc || !fi.hIcon)
         {
         m_icons[type].SetHICON((WXHICON)fi.hIcon);
         if (!rc || !fi.hIcon)
         {


@@ -621,6 +623,10 @@ wxIcon wxFSVolume::GetIcon(wxFSIconType type) const
     }
 
     return m_icons[type];
     }
 
     return m_icons[type];

+#else
+    wxFAIL_MSG(wxS("Can't convert HICON to wxIcon in this port."));
+    return wxNullIcon;
+#endif

 } // GetIcon
 
 #endif // wxUSE_GUI
 } // GetIcon
 
 #endif // wxUSE_GUI