Compilation fix for !wxUSE_OWNER_DRAWN.

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

diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp
index 28108588a1218070cb2f4a6690fbd2c4c64c550b..de73d9636871bf581f2a41bd961b90e39e33f3bd 100644 (file)
--- a/src/msw/cursor.cpp
+++ b/src/msw/cursor.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97

-// RCS-ID:      $Id$

 // Copyright:   (c) 1997-2003 Julian Smart and Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1997-2003 Julian Smart and Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -17,10 +16,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -28,19 +23,21 @@
     #pragma hdrstop
 #endif
 
     #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"
 #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/settings.h"
     #include "wx/intl.h"

+    #include "wx/image.h"
+    #include "wx/module.h"

 #endif
 
 #endif
 

-#include "wx/module.h"
-#include "wx/image.h"

 #include "wx/msw/private.h"
 #include "wx/msw/private.h"

+#include "wx/msw/missing.h" // IDC_HAND

 
 // define functions missing in MicroWin
 #ifdef __WXMICROWIN__
 
 // define functions missing in MicroWin
 #ifdef __WXMICROWIN__


@@ -107,8 +104,7 @@ public:
 
     virtual void OnExit()
     {
 
     virtual void OnExit()
     {

-        delete gs_globalCursor;
-        gs_globalCursor = (wxCursor *)NULL;
+        wxDELETE(gs_globalCursor);

     }
 };
 
     }
 };
 


@@ -180,19 +176,37 @@ wxCursor::wxCursor(const wxImage& image)
     const int w = wxCursorRefData::GetStandardWidth();
     const int h = wxCursorRefData::GetStandardHeight();
 
     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,
-                  _T("invalid cursor hot spot coordinates") );
+    wxASSERT_MSG( hotSpotX >= 0 && hotSpotX < image_w &&
+                  hotSpotY >= 0 && hotSpotY < image_h,
+                  wxT("invalid cursor hot spot coordinates") );
+
+    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 );

 
 

-    HCURSOR hcursor = wxBitmapToHCURSOR
-                      (
-                        wxBitmap(image.Scale(w, h)),
-                        hotSpotX,
-                        hotSpotY
-                      );

     if ( !hcursor )
     {
         wxLogWarning(_("Failed to create cursor."));
     if ( !hcursor )
     {
         wxLogWarning(_("Failed to create cursor."));


@@ -201,34 +215,19 @@ wxCursor::wxCursor(const wxImage& image)
 
     m_refData = new wxCursorRefData(hcursor, true /* delete it later */);
 }
 
     m_refData = new wxCursorRefData(hcursor, true /* delete it later */);
 }

-#endif
-
-wxCursor::wxCursor(const char WXUNUSED(bits)[],
-                   int WXUNUSED(width),
-                   int WXUNUSED(height),
-                   int WXUNUSED(hotSpotX), int WXUNUSED(hotSpotY),
-                   const char WXUNUSED(maskBits)[])
-{
-}
+#endif // wxUSE_IMAGE

 
 // MicroWin doesn't have support needed for the other ctors
 #ifdef __WXMICROWIN__
 
 
 // MicroWin doesn't have support needed for the other ctors
 #ifdef __WXMICROWIN__
 

-wxCursor::wxCursor(const wxString& WXUNUSED(filename),
-                   long WXUNUSED(kind),
-                   int WXUNUSED(hotSpotX),
-                   int WXUNUSED(hotSpotY))
-{
-}
-
-wxCursor::wxCursor(int WXUNUSED(cursor_type))
+wxCursor::InitFromStock(wxStockCursor WXUNUSED(cursor_type))

 {
 }
 
 #else // !__WXMICROWIN__
 
 wxCursor::wxCursor(const wxString& filename,
 {
 }
 
 #else // !__WXMICROWIN__
 
 wxCursor::wxCursor(const wxString& filename,

-                   long kind,
+                   wxBitmapType kind,

                    int hotSpotX,
                    int hotSpotY)
 {
                    int hotSpotX,
                    int hotSpotY)
 {


@@ -236,12 +235,13 @@ wxCursor::wxCursor(const wxString& filename,
     switch ( kind )
     {
         case wxBITMAP_TYPE_CUR_RESOURCE:
     switch ( kind )
     {
         case wxBITMAP_TYPE_CUR_RESOURCE:

-            hcursor = ::LoadCursor(wxGetInstance(), filename);
+            hcursor = ::LoadCursor(wxGetInstance(), filename.t_str());

             break;
 
 #ifndef __WXWINCE__
             break;
 
 #ifndef __WXWINCE__

+        case wxBITMAP_TYPE_ANI:

         case wxBITMAP_TYPE_CUR:
         case wxBITMAP_TYPE_CUR:

-            hcursor = ::LoadCursorFromFile(filename);
+            hcursor = ::LoadCursorFromFile(filename.t_str());

             break;
 #endif
 
             break;
 #endif
 


@@ -264,7 +264,7 @@ wxCursor::wxCursor(const wxString& filename,
             break;
 
         default:
             break;
 
         default:

-            wxFAIL_MSG( _T("unknown cursor resource type") );
+            wxLogError( wxT("unknown cursor resource type '%d'"), kind );

 
             hcursor = NULL;
     }
 
             hcursor = NULL;
     }


@@ -275,69 +275,135 @@ wxCursor::wxCursor(const wxString& filename,
     }
 }
 
     }
 }
 

-// all wxWidgets standard cursors
-static const struct StdCursor
+namespace

 {
 {

-    // is this a standard Windows cursor?
-    bool isStd;

 
 

-    // the cursor name or id
-    LPCTSTR name;
-} stdCursors[] =
+void ReverseBitmap(HBITMAP bitmap, int width, int height)

 {
 {

-    {  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
-};
+    MemoryHDC hdc;
+    SelectInHDC selBitmap(hdc, bitmap);
+    ::StretchBlt(hdc, width - 1, 0, -width, height,
+                 hdc, 0, 0, width, height, SRCCOPY);
+}
+
+HCURSOR CreateReverseCursor(HCURSOR cursor)
+{
+    ICONINFO info;
+    if ( !::GetIconInfo(cursor, &info) )
+        return NULL;

 
 

-wxCOMPILE_TIME_ASSERT( WXSIZEOF(stdCursors) == wxCURSOR_MAX,
-                       CursorsIdArrayMismatch );
+    HCURSOR cursorRev = NULL;
+
+    BITMAP bmp;
+    if ( ::GetObject(info.hbmMask, sizeof(bmp), &bmp) )
+    {
+        ReverseBitmap(info.hbmMask, bmp.bmWidth, bmp.bmHeight);
+        if ( info.hbmColor )
+            ReverseBitmap(info.hbmColor, bmp.bmWidth, bmp.bmHeight);
+        info.xHotspot = (DWORD)bmp.bmWidth - 1 - info.xHotspot;
+
+        cursorRev = ::CreateIconIndirect(&info);
+    }
+
+    ::DeleteObject(info.hbmMask);
+    if ( info.hbmColor )
+        ::DeleteObject(info.hbmColor);
+
+    return cursorRev;
+}
+
+} // anonymous namespace

 
 // Cursors by stock number
 
 // Cursors by stock number

-wxCursor::wxCursor(int idCursor)
+void wxCursor::InitFromStock(wxStockCursor 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, wxT("WXCURSOR_RIGHT_ARROW")  }, // wxCURSOR_RIGHT_ARROW
+        { false, wxT("WXCURSOR_BULLSEYE")     }, // wxCURSOR_BULLSEYE
+        {  true, IDC_ARROW                   }, // WXCURSOR_CHAR
+        {  true, IDC_CROSS                   }, // WXCURSOR_CROSS
+        {  true, IDC_HAND                    }, // wxCURSOR_HAND
+        {  true, IDC_IBEAM                   }, // WXCURSOR_IBEAM
+        {  true, IDC_ARROW                   }, // WXCURSOR_LEFT_BUTTON
+        { false, wxT("WXCURSOR_MAGNIFIER")    }, // wxCURSOR_MAGNIFIER
+        {  true, IDC_ARROW                   }, // WXCURSOR_MIDDLE_BUTTON
+        {  true, IDC_NO                      }, // WXCURSOR_NO_ENTRY
+        { false, wxT("WXCURSOR_PBRUSH")       }, // wxCURSOR_PAINT_BRUSH
+        { false, wxT("WXCURSOR_PENCIL")       }, // wxCURSOR_PENCIL
+        { false, wxT("WXCURSOR_PLEFT")        }, // wxCURSOR_POINT_LEFT
+        { false, wxT("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, wxT("WXCURSOR_PBRUSH")       }, // wxCURSOR_SPRAYCAN
+        {  true, IDC_WAIT                    }, // WXCURSOR_WAIT
+        {  true, IDC_WAIT                    }, // WXCURSOR_WATCH
+        { false, wxT("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),
     wxCHECK_RET( idCursor > 0 && (size_t)idCursor < WXSIZEOF(stdCursors),

-                 _T("invalid cursor id in wxCursor() ctor") );
+                 wxT("invalid cursor id in wxCursor() ctor") );

 
     const StdCursor& stdCursor = stdCursors[idCursor];
 
     const StdCursor& stdCursor = stdCursors[idCursor];

+    bool deleteLater = !stdCursor.isStd;

 
     HCURSOR hcursor = ::LoadCursor(stdCursor.isStd ? NULL : wxGetInstance(),
                                    stdCursor.name);
 
 
     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(), wxT("WXCURSOR_HAND"));
+        deleteLater = true;
+    }
+
+    if ( !hcursor && idCursor == wxCURSOR_RIGHT_ARROW)
+    {
+        hcursor = ::LoadCursor(NULL, IDC_ARROW);
+        if ( hcursor )
+        {
+            hcursor = CreateReverseCursor(hcursor);
+            deleteLater = true;
+        }
+    }
+

     if ( !hcursor )
     {
     if ( !hcursor )
     {

-        wxLogLastError(_T("LoadCursor"));
+        if ( !stdCursor.isStd )
+        {
+            // it may be not obvious to the programmer why did loading fail,
+            // try to help by pointing to the by far the most probable reason
+            wxFAIL_MSG(wxT("Loading a cursor defined by wxWidgets failed, ")
+                       wxT("did you include include/wx/msw/wx.rc file from ")
+                       wxT("your resource file?"));
+        }
+
+        wxLogLastError(wxT("LoadCursor"));

     }
     else
     {
     }
     else
     {

-        m_refData = new wxCursorRefData(hcursor);
+        m_refData = new wxCursorRefData(hcursor, deleteLater);

     }
 }
 
     }
 }
 


@@ -351,16 +417,6 @@ wxCursor::~wxCursor()
 // other wxCursor functions
 // ----------------------------------------------------------------------------
 
 // 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;
 wxGDIImageRefData *wxCursor::CreateData() const
 {
     return new wxCursorRefData;


@@ -377,7 +433,7 @@ const wxCursor *wxGetGlobalCursor()
 
 void wxSetCursor(const wxCursor& cursor)
 {
 
 void wxSetCursor(const wxCursor& cursor)
 {

-    if ( cursor.Ok() )
+    if ( cursor.IsOk() )

     {
         ::SetCursor(GetHcursorOf(cursor));
 
     {
         ::SetCursor(GetHcursorOf(cursor));
 


@@ -385,5 +441,3 @@ void wxSetCursor(const wxCursor& cursor)
             *gs_globalCursor = cursor;
     }
 }
             *gs_globalCursor = cursor;
     }
 }

-
-