X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b96340e6f457071d63196f877c6df0ea1cc2af04..09e48f0b1917db7e455f28c2c9ed661d39e9ab65:/src/msw/cursor.cpp diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp index 0f7ce4ac2a..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,16 +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; @@ -303,6 +320,7 @@ wxCursor::wxCursor(int cursor_type) refData->m_hCursor = (WXHCURSOR) LoadCursor((HINSTANCE) NULL, IDC_ARROW); break; } +#endif } wxCursor::~wxCursor() @@ -322,7 +340,9 @@ void wxSetCursor(const wxCursor& cursor) { if ( cursor.Ok() ) { +#ifndef __WXMICROWIN__ ::SetCursor(GetHcursorOf(cursor)); +#endif if ( gs_globalCursor ) *gs_globalCursor = cursor;