X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/04ef50df3a0fa3c343800c554e609f98fc7575cc..df16a53ef9ae506c51023178e4fe45ce45e69447:/src/msw/cursor.cpp diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp index 2d93aa7419..756308ebd2 100644 --- a/src/msw/cursor.cpp +++ b/src/msw/cursor.cpp @@ -96,7 +96,7 @@ wxCursorRefData::wxCursorRefData() m_width = 32; m_height = 32; - m_destroyCursor = FALSE; + m_destroyCursor = TRUE; } void wxCursorRefData::Free() @@ -138,8 +138,6 @@ wxCursor::wxCursor(const wxString& cursor_file, wxCursorRefData *refData = new wxCursorRefData; m_refData = refData; - refData->m_destroyCursor = FALSE; - if (flags == wxBITMAP_TYPE_CUR_RESOURCE) { #ifdef __WIN95__ @@ -155,7 +153,6 @@ wxCursor::wxCursor(const wxString& cursor_file, #else #if wxUSE_RESOURCE_LOADING_IN_MSW refData->m_hCursor = (WXHCURSOR) ReadCursorFile(WXSTRINGCAST cursor_file, wxGetInstance(), &refData->m_width, &refData->m_height); - refData->m_destroyCursor = TRUE; #endif #endif } @@ -163,7 +160,6 @@ wxCursor::wxCursor(const wxString& cursor_file, { #if wxUSE_RESOURCE_LOADING_IN_MSW refData->m_hCursor = (WXHCURSOR) IconToCursor(WXSTRINGCAST cursor_file, wxGetInstance(), hotSpotX, hotSpotY, &refData->m_width, &refData->m_height); - refData->m_destroyCursor = TRUE; #endif } else if (flags == wxBITMAP_TYPE_BMP) @@ -180,7 +176,6 @@ wxCursor::wxCursor(const wxString& cursor_file, pnt.x = hotSpotX; pnt.y = hotSpotY; refData->m_hCursor = (WXHCURSOR) MakeCursorFromBitmap(wxGetInstance(), hBitmap, &pnt); - refData->m_destroyCursor = TRUE; DeleteObject(hBitmap); #endif } @@ -321,6 +316,9 @@ wxCursor::wxCursor(int cursor_type) break; } #endif + + // no need to destroy the stock cursors + refData->m_destroyCursor = FALSE; } wxCursor::~wxCursor()