Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compilation of MSW wxFSVolume with non-wxMSW ports.

Browse Source 
There is no way to construct wxIcon from HICON when not using wxMSW, just
leave it unimplemented for non-wxMSW ports.

Closes #14402.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71786 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-06-15 23:23:16 +00:00
parent 568fb7e9f6
commit 95fbc73897
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/msw/volume.cpp
View File

@@ -584,6 +584,7 @@ wxIcon wxFSVolume::GetIcon(wxFSIconType type) const
wxCHECK_MSG( type >= 0 && (size_t)type < m_icons.GetCount(), wxNullIcon, wxCHECK_MSG( type >= 0 && (size_t)type < m_icons.GetCount(), wxNullIcon,
wxT("wxFSIconType::GetIcon(): invalid icon index") ); wxT("wxFSIconType::GetIcon(): invalid icon index") );
#ifdef __WXMSW__
// Load on demand. // Load on demand.
if (m_icons[type].IsNull()) if (m_icons[type].IsNull())
{ {
@@ -621,6 +622,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 } // GetIcon
#endif // wxUSE_GUI #endif // wxUSE_GUI