X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/51d5ec540813b54e5590cc473b0252d51754e152..cb73e6001f891ae46b12a1e4ca39b93649cb6099:/src/msw/cursor.cpp?ds=sidebyside diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp index bf69c83f6d..3ea5cb7497 100644 --- a/src/msw/cursor.cpp +++ b/src/msw/cursor.cpp @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "cursor.h" #endif @@ -155,8 +155,10 @@ void wxCursorRefData::Free() { if ( m_hCursor ) { +#ifndef __WXWINCE__ if ( m_destroyCursor ) ::DestroyCursor((HCURSOR)m_hCursor); +#endif m_hCursor = 0; } @@ -235,9 +237,11 @@ wxCursor::wxCursor(const wxString& filename, hcursor = ::LoadCursor(wxGetInstance(), filename); break; +#ifndef __WXWINCE__ case wxBITMAP_TYPE_CUR: hcursor = ::LoadCursorFromFile(filename); break; +#endif case wxBITMAP_TYPE_ICO: hcursor = wxBitmapToHCURSOR @@ -266,10 +270,6 @@ wxCursor::wxCursor(const wxString& filename, if ( hcursor ) { m_refData = new wxCursorRefData(hcursor, true /* delete it later */); - -#if WXWIN_COMPATIBILITY_2 - ((wxCursorRefData *)m_refData)->SetOk(); -#endif // WXWIN_COMPATIBILITY_2 } }