X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1a97976a450be36d74d20bd85a314d724c83ac8a..69659fd770f615210efac4b4fa741b3ad6223616:/src/msw/cursor.cpp?ds=sidebyside diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp index c8e43a4d48..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__ @@ -102,7 +100,7 @@ public: { gs_globalCursor = new wxCursor; - return TRUE; + return true; } virtual void OnExit() @@ -172,6 +170,7 @@ wxCursor::wxCursor() { } +#if wxUSE_IMAGE wxCursor::wxCursor(const wxImage& image) { // image has to be of the standard cursor size, otherwise we won't be able @@ -179,19 +178,37 @@ wxCursor::wxCursor(const wxImage& image) const int w = wxCursorRefData::GetStandardWidth(); const int h = wxCursorRefData::GetStandardHeight(); - const int hotSpotX = image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X); - const int hotSpotY = image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y); + int hotSpotX = image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X); + int hotSpotY = image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y); + int image_w = image.GetWidth(); + int image_h = image.GetHeight(); - wxASSERT_MSG( hotSpotX >= 0 && hotSpotX < w && - hotSpotY >= 0 && hotSpotY < h, + wxASSERT_MSG( hotSpotX >= 0 && hotSpotX < image_w && + hotSpotY >= 0 && hotSpotY < image_h, _T("invalid cursor hot spot coordinates") ); - HCURSOR hcursor = wxBitmapToHCURSOR - ( - wxBitmap(image.Scale(w, h)), - hotSpotX, - hotSpotY - ); + wxImage imageSized(image); // final image of correct size + + // if image is too small then place it in the center, resize it if too big + if ((w > image_w) && (h > image_h)) + { + wxPoint offset((w - image_w)/2, (h - image_h)/2); + hotSpotX = hotSpotX + offset.x; + hotSpotY = hotSpotY + offset.y; + + imageSized = image.Size(wxSize(w, h), offset); + } + else if ((w != image_w) || (h != 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), + hotSpotX, hotSpotY ); + if ( !hcursor ) { wxLogWarning(_("Failed to create cursor.")); @@ -200,6 +217,7 @@ wxCursor::wxCursor(const wxImage& image) m_refData = new wxCursorRefData(hcursor, true /* delete it later */); } +#endif // wxUSE_IMAGE wxCursor::wxCursor(const char WXUNUSED(bits)[], int WXUNUSED(width), @@ -234,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 @@ -276,7 +294,7 @@ wxCursor::wxCursor(const wxString& filename, // Cursors by stock number wxCursor::wxCursor(int idCursor) { - // all wxWindows standard cursors + // all wxWidgets standard cursors static const struct StdCursor { // is this a standard Windows cursor? @@ -291,17 +309,24 @@ 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 { true, IDC_ARROW }, // WXCURSOR_MIDDLE_BUTTON { true, IDC_NO }, // WXCURSOR_NO_ENTRY - { false, _T("WXCURSOR_PAINT_BRUSH") }, // wxCURSOR_PAINT_BRUSH + { false, _T("WXCURSOR_PBRUSH") }, // wxCURSOR_PAINT_BRUSH { false, _T("WXCURSOR_PENCIL") }, // wxCURSOR_PENCIL - { false, _T("WXCURSOR_POINT_LEFT") }, // wxCURSOR_POINT_LEFT - { false, _T("WXCURSOR_POINT_RIGHT") }, // wxCURSOR_POINT_RIGHT + { false, _T("WXCURSOR_PLEFT") }, // wxCURSOR_POINT_LEFT + { false, _T("WXCURSOR_PRIGHT") }, // wxCURSOR_POINT_RIGHT { true, IDC_HELP }, // WXCURSOR_QUESTION_ARROW { true, IDC_ARROW }, // WXCURSOR_RIGHT_BUTTON { true, IDC_SIZENESW }, // WXCURSOR_SIZENESW @@ -309,7 +334,7 @@ wxCursor::wxCursor(int idCursor) { true, IDC_SIZENWSE }, // WXCURSOR_SIZENWSE { true, IDC_SIZEWE }, // WXCURSOR_SIZEWE { true, IDC_SIZEALL }, // WXCURSOR_SIZING - { false, _T("WXCURSOR_SPRAYCAN") }, // wxCURSOR_SPRAYCAN + { false, _T("WXCURSOR_PBRUSH") }, // wxCURSOR_SPRAYCAN { true, IDC_WAIT }, // WXCURSOR_WAIT { true, IDC_WAIT }, // WXCURSOR_WATCH { false, _T("WXCURSOR_BLANK") }, // wxCURSOR_BLANK @@ -325,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); } } @@ -349,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; @@ -383,5 +406,3 @@ void wxSetCursor(const wxCursor& cursor) *gs_globalCursor = cursor; } } - -