X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83f96286bb4ef34147d7f467a0f0a4a4fc27af2d..a0e449ff41f55b4d82f108f72638f852c962da2d:/src/msw/cursor.cpp diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp index 892ca4ee0f..2d93aa7419 100644 --- a/src/msw/cursor.cpp +++ b/src/msw/cursor.cpp @@ -39,7 +39,9 @@ #include "wx/module.h" #include "wx/msw/private.h" +#ifndef __WXMICROWIN__ #include "wx/msw/dib.h" +#endif #if wxUSE_RESOURCE_LOADING_IN_MSW #include "wx/msw/curico.h" @@ -101,8 +103,10 @@ void wxCursorRefData::Free() { if ( m_hCursor ) { +#ifndef __WXMICROWIN__ if ( m_destroyCursor ) ::DestroyCursor((HCURSOR)m_hCursor); +#endif m_hCursor = 0; } @@ -128,6 +132,9 @@ wxCursor::wxCursor(const wxString& cursor_file, long flags, int hotSpotX, int hotSpotY) { +#ifdef __WXMICROWIN__ + m_refData = NULL; +#else wxCursorRefData *refData = new wxCursorRefData; m_refData = refData; @@ -181,19 +188,26 @@ wxCursor::wxCursor(const wxString& cursor_file, #if WXWIN_COMPATIBILITY_2 refData->SetOk(); #endif // WXWIN_COMPATIBILITY_2 + +#endif } // Cursors by stock number wxCursor::wxCursor(int cursor_type) { +#ifdef __WXMICROWIN__ + m_refData = NULL; +#else wxCursorRefData *refData = new wxCursorRefData; m_refData = refData; switch (cursor_type) { case wxCURSOR_ARROWWAIT: +#ifndef __WIN16__ refData->m_hCursor = (WXHCURSOR) LoadCursor((HINSTANCE) NULL, IDC_APPSTARTING); break; +#endif case wxCURSOR_WAIT: refData->m_hCursor = (WXHCURSOR) LoadCursor((HINSTANCE) NULL, IDC_WAIT); break; @@ -306,6 +320,7 @@ wxCursor::wxCursor(int cursor_type) refData->m_hCursor = (WXHCURSOR) LoadCursor((HINSTANCE) NULL, IDC_ARROW); break; } +#endif } wxCursor::~wxCursor() @@ -325,7 +340,9 @@ void wxSetCursor(const wxCursor& cursor) { if ( cursor.Ok() ) { +#ifndef __WXMICROWIN__ ::SetCursor(GetHcursorOf(cursor)); +#endif if ( gs_globalCursor ) *gs_globalCursor = cursor;