X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/76a5e5d21ee1a6230d777ce0209b2df4c6075f0f..9b69526274b023fa1460b29a92bea8bf82e4703f:/src/mac/carbon/cursor.cpp?ds=sidebyside diff --git a/src/mac/carbon/cursor.cpp b/src/mac/carbon/cursor.cpp index c65a32ecb1..23b9eb4c0c 100644 --- a/src/mac/carbon/cursor.cpp +++ b/src/mac/carbon/cursor.cpp @@ -13,6 +13,9 @@ #pragma implementation "cursor.h" #endif +#include "wx/defs.h" + +#include "wx/app.h" #include "wx/cursor.h" #include "wx/icon.h" #include "wx/mac/private.h" @@ -76,7 +79,8 @@ wxCursor::wxCursor(const wxString& cursor_file, long flags, int hotSpotX, int ho wxCursor::wxCursor(int cursor_type) { m_refData = new wxCursorRefData; - + + switch (cursor_type) { case wxCURSOR_WAIT: @@ -89,47 +93,64 @@ wxCursor::wxCursor(int cursor_type) M_CURSORDATA->m_hCursor = ::GetCursor(crossCursor); break; case wxCURSOR_SIZENWSE: - M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeWEId); + { + wxStAppResource resload ; + M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeWEId); + } break; case wxCURSOR_SIZENESW: - M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeWEId); + { + wxStAppResource resload ; + M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeWEId); + } break; case wxCURSOR_SIZEWE: - M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeWEId); + { + wxStAppResource resload ; + M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeWEId); + } break; case wxCURSOR_SIZENS: - M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeNSId); + { + wxStAppResource resload ; + M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeNSId); + } break; case wxCURSOR_CHAR: - { - M_CURSORDATA->m_hCursor = MacArrowCursor; - break; - } + { + M_CURSORDATA->m_hCursor = MacArrowCursor; + break; + } case wxCURSOR_HAND: - { - M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId); - break; - } + { + wxStAppResource resload ; + M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId); + } + break; case wxCURSOR_BULLSEYE: - { - M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId); - break; - } + { + wxStAppResource resload ; + M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId); + } + break; case wxCURSOR_PENCIL: - { - M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId); - break; - } + { + wxStAppResource resload ; + M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId); + } + break; case wxCURSOR_MAGNIFIER: - { - M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId); - break; - } + { + wxStAppResource resload ; + M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId); + } + break; case wxCURSOR_NO_ENTRY: - { - M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId); - break; - } + { + wxStAppResource resload ; + M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId); + } + break; case wxCURSOR_LEFT_BUTTON: { M_CURSORDATA->m_hCursor = MacArrowCursor;