X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a6c2e2c7657b09cfbccb82c966451cc902802893..722f74cec895bbc284ba7b7a7213ee5cf2a1ab95:/src/msw/cursor.cpp?ds=sidebyside diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp index 5093518a98..5e0bb783f9 100644 --- a/src/msw/cursor.cpp +++ b/src/msw/cursor.cpp @@ -209,17 +209,15 @@ wxCursor::wxCursor(const wxImage& image) HCURSOR hcursor = wxBitmapToHCURSOR( wxBitmap(imageSized), hotSpotX, hotSpotY ); -#if wxUSE_WXDIB if ( !hcursor ) { wxLogWarning(_("Failed to create cursor.")); return; } -#endif // wxUSE_WXDIB m_refData = new wxCursorRefData(hcursor, true /* delete it later */); } -#endif +#endif // wxUSE_IMAGE wxCursor::wxCursor(const char WXUNUSED(bits)[], int WXUNUSED(width), @@ -254,12 +252,12 @@ wxCursor::wxCursor(const wxString& filename, switch ( kind ) { case wxBITMAP_TYPE_CUR_RESOURCE: - hcursor = ::LoadCursor(wxGetInstance(), filename); + hcursor = ::LoadCursor(wxGetInstance(), filename.fn_str()); break; #ifndef __WXWINCE__ case wxBITMAP_TYPE_CUR: - hcursor = ::LoadCursorFromFile(filename); + hcursor = ::LoadCursorFromFile(filename.fn_str()); break; #endif