X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5360828db9ece34c6c7dc81ec7b4a294e6cd5cd5..93ccaed86983970c4a2aa5af34593781e5b8964f:/src/msw/cursor.cpp diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp index 3ae986e719..4d2bdf322d 100644 --- a/src/msw/cursor.cpp +++ b/src/msw/cursor.cpp @@ -80,7 +80,11 @@ wxCursor::wxCursor(const wxString& cursor_file, long flags, int hotSpotX, int ho M_CURSORDATA->m_ok = FALSE; if (flags & wxBITMAP_TYPE_CUR_RESOURCE) { +#ifdef __WIN95__ + M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadImage(wxGetInstance(), cursor_file, IMAGE_CURSOR, 0, 0, 0); +#else M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor(wxGetInstance(), cursor_file); +#endif if (M_CURSORDATA->m_hCursor) M_CURSORDATA->m_ok = TRUE; else @@ -88,9 +92,13 @@ wxCursor::wxCursor(const wxString& cursor_file, long flags, int hotSpotX, int ho } else if (flags & wxBITMAP_TYPE_CUR) { +#ifdef __WIN95__ + M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadImage(wxGetInstance(), cursor_file, IMAGE_CURSOR, 0, 0, LR_LOADFROMFILE); +#else #if wxUSE_RESOURCE_LOADING_IN_MSW M_CURSORDATA->m_hCursor = (WXHCURSOR) ReadCursorFile(WXSTRINGCAST cursor_file, wxGetInstance(), &M_CURSORDATA->m_width, &M_CURSORDATA->m_height); M_CURSORDATA->m_destroyCursor = TRUE; +#endif #endif } else if (flags & wxBITMAP_TYPE_ICO)