Correction in comment in closing #endif. Is VC++ 4 supported?

[wxWidgets.git] / src / msw / cursor.cpp

diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp
index 28108588a1218070cb2f4a6690fbd2c4c64c550b..4dee125894752eae54b4ed9b8dcfcecbaaf7bac1 100644 (file)
--- a/src/msw/cursor.cpp
+++ b/src/msw/cursor.cpp
@@ -180,19 +180,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."));
@@ -275,54 +293,56 @@ wxCursor::wxCursor(const wxString& filename,
     }
 }
 
-// all wxWidgets standard cursors
-static const struct StdCursor
-{
-    // is this a standard Windows cursor?
-    bool isStd;
-
-    // the cursor name or id
-    LPCTSTR name;
-} stdCursors[] =
-{
-    {  true, NULL                        }, // wxCURSOR_NONE
-    {  true, IDC_ARROW                   }, // wxCURSOR_ARROW
-    { 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
-    {  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_PBRUSH")       }, // wxCURSOR_PAINT_BRUSH
-    { false, _T("WXCURSOR_PENCIL")       }, // wxCURSOR_PENCIL
-    { 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
-    {  true, IDC_SIZENS                  }, // WXCURSOR_SIZENS
-    {  true, IDC_SIZENWSE                }, // WXCURSOR_SIZENWSE
-    {  true, IDC_SIZEWE                  }, // WXCURSOR_SIZEWE
-    {  true, IDC_SIZEALL                 }, // WXCURSOR_SIZING
-    { false, _T("WXCURSOR_PBRUSH")       }, // wxCURSOR_SPRAYCAN
-    {  true, IDC_WAIT                    }, // WXCURSOR_WAIT
-    { false, _T("WXCURSOR_WATCH")        }, // WXCURSOR_WATCH
-    { false, _T("WXCURSOR_BLANK")        }, // wxCURSOR_BLANK
-    {  true, IDC_APPSTARTING             }, // wxCURSOR_ARROWWAIT
-
-    // no entry for wxCURSOR_MAX
-};
-
-wxCOMPILE_TIME_ASSERT( WXSIZEOF(stdCursors) == wxCURSOR_MAX,
-                       CursorsIdArrayMismatch );
-
 // Cursors by stock number
 wxCursor::wxCursor(int idCursor)
 {
+    // all wxWidgets standard cursors
+    static const struct StdCursor
+    {
+        // is this a standard Windows cursor?
+        bool isStd;
+
+        // the cursor name or id
+        LPCTSTR name;
+    } stdCursors[] =
+    {
+        {  true, NULL                        }, // wxCURSOR_NONE
+        {  true, IDC_ARROW                   }, // wxCURSOR_ARROW
+        { 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
+        { false, _T("WXCURSOR_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_PBRUSH")       }, // wxCURSOR_PAINT_BRUSH
+        { false, _T("WXCURSOR_PENCIL")       }, // wxCURSOR_PENCIL
+        { 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
+        {  true, IDC_SIZENS                  }, // WXCURSOR_SIZENS
+        {  true, IDC_SIZENWSE                }, // WXCURSOR_SIZENWSE
+        {  true, IDC_SIZEWE                  }, // WXCURSOR_SIZEWE
+        {  true, IDC_SIZEALL                 }, // WXCURSOR_SIZING
+        { false, _T("WXCURSOR_PBRUSH")       }, // wxCURSOR_SPRAYCAN
+        {  true, IDC_WAIT                    }, // WXCURSOR_WAIT
+        { false, _T("WXCURSOR_WATCH")        }, // WXCURSOR_WATCH
+        { false, _T("WXCURSOR_BLANK")        }, // wxCURSOR_BLANK
+        {  true, IDC_APPSTARTING             }, // wxCURSOR_ARROWWAIT
+
+        // no entry for wxCURSOR_MAX
+    };
+
+    wxCOMPILE_TIME_ASSERT( WXSIZEOF(stdCursors) == wxCURSOR_MAX,
+                           CursorsIdArrayMismatch );
+
     wxCHECK_RET( idCursor > 0 && (size_t)idCursor < WXSIZEOF(stdCursors),
                  _T("invalid cursor id in wxCursor() ctor") );