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

Fix wxIconBundle::AddIcon() compilation in wxGTK/Win32

Browse Source 
This function doesn't compile currently because CreateFromHICON() is
wxMSW-only, so disable it it to at least let wxGTK compile for now, even
if the real solution would be to implement CreateFromHICON() for wxGTK
too.

Closes #17875.
This commit is contained in:
Kolya Kosenko
2017-07-13 23:02:03 +02:00
committed by Vadim Zeitlin
parent 31ba2d4ca3
commit a770cd8d79
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/iconbndl.cpp
View File

@@ -216,6 +216,7 @@ void wxIconBundle::AddIcon(wxInputStream& stream, wxBitmapType type)
// stored as an MS Windows resource. // stored as an MS Windows resource.
void wxIconBundle::AddIcon(const wxString& resourceName, WXHINSTANCE module) void wxIconBundle::AddIcon(const wxString& resourceName, WXHINSTANCE module)
{ {
#ifdef __WXMSW__
const void* data = NULL; const void* data = NULL;
size_t outLen = 0; size_t outLen = 0;
@@ -249,6 +250,9 @@ void wxIconBundle::AddIcon(const wxString& resourceName, WXHINSTANCE module)
wxLogDebug(wxS("Failed to load icon with id %u for group icon resource '%s'."), iconID, resourceName); wxLogDebug(wxS("Failed to load icon with id %u for group icon resource '%s'."), iconID, resourceName);
} }
} }
#else
wxLogError(wxS("Loading icons from resources isn't implemented in this toolkit port yet."));
#endif
} }
#endif // defined(__WINDOWS__) && wxUSE_ICO_CUR #endif // defined(__WINDOWS__) && wxUSE_ICO_CUR