X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b737ad10dec946cd7d5e38c43c666e8efe89f0ae..69659fd770f615210efac4b4fa741b3ad6223616:/src/msw/cursor.cpp diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp index 23495af1aa..5e0bb783f9 100644 --- a/src/msw/cursor.cpp +++ b/src/msw/cursor.cpp @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "cursor.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -28,19 +24,21 @@ #pragma hdrstop #endif +#include "wx/cursor.h" + #ifndef WX_PRECOMP #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__ @@ -202,13 +200,13 @@ wxCursor::wxCursor(const wxImage& image) } else if ((w != image_w) || (h != image_h)) { - hotSpotX = int(hotSpotX * double(w) / double(image_w)); - hotSpotY = int(hotSpotY * double(h) / double(image_h)); + hotSpotX = int(hotSpotX * double(w) / double(image_w)); + hotSpotY = int(hotSpotY * double(h) / double(image_h)); imageSized = image.Scale(w, h); } - HCURSOR hcursor = wxBitmapToHCURSOR( wxBitmap(imageSized), + HCURSOR hcursor = wxBitmapToHCURSOR( wxBitmap(imageSized), hotSpotX, hotSpotY ); if ( !hcursor ) @@ -219,7 +217,7 @@ wxCursor::wxCursor(const wxImage& image) m_refData = new wxCursorRefData(hcursor, true /* delete it later */); } -#endif +#endif // wxUSE_IMAGE wxCursor::wxCursor(const char WXUNUSED(bits)[], int WXUNUSED(width), @@ -254,12 +252,12 @@ wxCursor::wxCursor(const wxString& filename, switch ( kind ) { case wxBITMAP_TYPE_CUR_RESOURCE: - hcursor = ::LoadCursor(wxGetInstance(), filename); + hcursor = ::LoadCursor(wxGetInstance(), filename.fn_str()); break; #ifndef __WXWINCE__ case wxBITMAP_TYPE_CUR: - hcursor = ::LoadCursorFromFile(filename); + hcursor = ::LoadCursorFromFile(filename.fn_str()); break; #endif @@ -311,8 +309,15 @@ wxCursor::wxCursor(int idCursor) { false, _T("WXCURSOR_RIGHT_ARROW") }, // wxCURSOR_RIGHT_ARROW { false, _T("WXCURSOR_BULLSEYE") }, // wxCURSOR_BULLSEYE { true, IDC_ARROW }, // WXCURSOR_CHAR - { true, IDC_CROSS }, // WXCURSOR_CROSS - { false, _T("WXCURSOR_HAND") }, // wxCURSOR_HAND + + // Displays as an I-beam on XP, so use a cursor file +// { true, IDC_CROSS }, // WXCURSOR_CROSS + { false, _T("WXCURSOR_CROSS") }, // WXCURSOR_CROSS + + // 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 @@ -331,7 +336,7 @@ wxCursor::wxCursor(int idCursor) { true, IDC_SIZEALL }, // WXCURSOR_SIZING { false, _T("WXCURSOR_PBRUSH") }, // wxCURSOR_SPRAYCAN { true, IDC_WAIT }, // WXCURSOR_WAIT - { false, _T("WXCURSOR_WATCH") }, // WXCURSOR_WATCH + { true, IDC_WAIT }, // WXCURSOR_WATCH { false, _T("WXCURSOR_BLANK") }, // wxCURSOR_BLANK { true, IDC_APPSTARTING }, // wxCURSOR_ARROWWAIT @@ -345,17 +350,25 @@ wxCursor::wxCursor(int idCursor) _T("invalid cursor id in wxCursor() ctor") ); const StdCursor& stdCursor = stdCursors[idCursor]; + bool deleteLater = !stdCursor.isStd; HCURSOR hcursor = ::LoadCursor(stdCursor.isStd ? NULL : wxGetInstance(), stdCursor.name); + // IDC_HAND may not be available on some versions of Windows. + if ( !hcursor && idCursor == wxCURSOR_HAND) + { + hcursor = ::LoadCursor(wxGetInstance(), _T("WXCURSOR_HAND")); + deleteLater = true; + } + if ( !hcursor ) { wxLogLastError(_T("LoadCursor")); } else { - m_refData = new wxCursorRefData(hcursor); + m_refData = new wxCursorRefData(hcursor, deleteLater); } } @@ -369,16 +382,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; @@ -403,5 +406,3 @@ void wxSetCursor(const wxCursor& cursor) *gs_globalCursor = cursor; } } - -