X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2432b92dd7a837db13d3938a56c1959decd03203..ea9a4296a23fa5b1441e9d3abca357fe7cb412b5:/src/msw/icon.cpp diff --git a/src/msw/icon.cpp b/src/msw/icon.cpp index ed875403a2..a788d29ed1 100644 --- a/src/msw/icon.cpp +++ b/src/msw/icon.cpp @@ -32,11 +32,6 @@ #include "wx/msw/private.h" #include "assert.h" -#if wxUSE_XPM_IN_MSW -#define FOR_MSW 1 -#include "../src/xpm/xpm34.h" -#endif - #if wxUSE_RESOURCE_LOADING_IN_MSW #include "wx/msw/curico.h" #include "wx/msw/curicop.h" @@ -124,7 +119,7 @@ bool wxICOFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long fla { wxIcon *icon = (wxIcon *)bitmap; wxIconRefData *data = (wxIconRefData *)icon->GetRefData(); - data->m_hIcon = (WXHICON)ReadIconFile((char *)name.c_str(), wxGetInstance(), + data->m_hIcon = (WXHICON)ReadIconFile((wxChar *)name.c_str(), wxGetInstance(), &data->m_width, &data->m_height); data->m_ok = data->m_hIcon != 0;