Fixed cursor loading on Win95
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3586 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -80,7 +80,11 @@ wxCursor::wxCursor(const wxString& cursor_file, long flags, int hotSpotX, int ho
|
|||||||
M_CURSORDATA->m_ok = FALSE;
|
M_CURSORDATA->m_ok = FALSE;
|
||||||
if (flags & wxBITMAP_TYPE_CUR_RESOURCE)
|
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);
|
M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor(wxGetInstance(), cursor_file);
|
||||||
|
#endif
|
||||||
if (M_CURSORDATA->m_hCursor)
|
if (M_CURSORDATA->m_hCursor)
|
||||||
M_CURSORDATA->m_ok = TRUE;
|
M_CURSORDATA->m_ok = TRUE;
|
||||||
else
|
else
|
||||||
@@ -88,9 +92,13 @@ wxCursor::wxCursor(const wxString& cursor_file, long flags, int hotSpotX, int ho
|
|||||||
}
|
}
|
||||||
else if (flags & wxBITMAP_TYPE_CUR)
|
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
|
#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_hCursor = (WXHCURSOR) ReadCursorFile(WXSTRINGCAST cursor_file, wxGetInstance(), &M_CURSORDATA->m_width, &M_CURSORDATA->m_height);
|
||||||
M_CURSORDATA->m_destroyCursor = TRUE;
|
M_CURSORDATA->m_destroyCursor = TRUE;
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
else if (flags & wxBITMAP_TYPE_ICO)
|
else if (flags & wxBITMAP_TYPE_ICO)
|
||||||
|
Reference in New Issue
Block a user