X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/64c288fa47480385ad656ae3249b5b131340c1d6..e10b8ce820a08b5364c5ab93a462458881fed318:/src/msw/cursor.cpp diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp index 3a6a3e9e80..998ec54bce 100644 --- a/src/msw/cursor.cpp +++ b/src/msw/cursor.cpp @@ -24,21 +24,21 @@ #pragma hdrstop #endif +#include "wx/cursor.h" + #ifndef WX_PRECOMP + #include "wx/msw/missing.h" // IDC_HAND #include "wx/utils.h" #include "wx/app.h" #include "wx/bitmap.h" #include "wx/icon.h" - #include "wx/cursor.h" #include "wx/settings.h" #include "wx/intl.h" + #include "wx/image.h" + #include "wx/module.h" #endif -#include "wx/module.h" -#include "wx/image.h" - #include "wx/msw/private.h" -#include "wx/msw/missing.h" // IDC_HAND // define functions missing in MicroWin #ifdef __WXMICROWIN__ @@ -217,7 +217,7 @@ wxCursor::wxCursor(const wxImage& image) } #else HCURSOR hcursor = 0; -#endif +#endif m_refData = new wxCursorRefData(hcursor, true /* delete it later */); } @@ -313,7 +313,7 @@ wxCursor::wxCursor(int idCursor) { false, _T("WXCURSOR_RIGHT_ARROW") }, // wxCURSOR_RIGHT_ARROW { false, _T("WXCURSOR_BULLSEYE") }, // wxCURSOR_BULLSEYE { true, IDC_ARROW }, // WXCURSOR_CHAR - + // Displays as an I-beam on XP, so use a cursor file // { true, IDC_CROSS }, // WXCURSOR_CROSS { false, _T("WXCURSOR_CROSS") }, // WXCURSOR_CROSS @@ -321,7 +321,7 @@ wxCursor::wxCursor(int idCursor) // See special handling below for wxCURSOR_HAND // { false, _T("WXCURSOR_HAND") }, // wxCURSOR_HAND { true, IDC_HAND }, // wxCURSOR_HAND - + { true, IDC_IBEAM }, // WXCURSOR_IBEAM { true, IDC_ARROW }, // WXCURSOR_LEFT_BUTTON { false, _T("WXCURSOR_MAGNIFIER") }, // wxCURSOR_MAGNIFIER @@ -365,7 +365,7 @@ wxCursor::wxCursor(int idCursor) hcursor = ::LoadCursor(wxGetInstance(), _T("WXCURSOR_HAND")); deleteLater = true; } - + if ( !hcursor ) { wxLogLastError(_T("LoadCursor")); @@ -386,16 +386,6 @@ wxCursor::~wxCursor() // other wxCursor functions // ---------------------------------------------------------------------------- -bool wxCursor::operator==(const wxCursor& cursor) const -{ - if ( !m_refData ) - return !cursor.m_refData; - - return cursor.m_refData && - ((wxCursorRefData *)m_refData)->m_hCursor == - ((wxCursorRefData *)cursor.m_refData)->m_hCursor; -} - wxGDIImageRefData *wxCursor::CreateData() const { return new wxCursorRefData; @@ -420,5 +410,3 @@ void wxSetCursor(const wxCursor& cursor) *gs_globalCursor = cursor; } } - -