X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/57c208c5759da71a637f0f0f5b7d3dc3eda09c02..683730003ba8f36fa07496b8f298d40733534aea:/src/msw/cursor.cpp

diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp
index 6e8fc77ee2..d3e67418a9 100644
--- a/src/msw/cursor.cpp
+++ b/src/msw/cursor.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows licence
+// Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -27,6 +27,7 @@
 #include "wx/utils.h"
 #include "wx/app.h"
 #include "wx/cursor.h"
+#include "wx/icon.h"
 #endif
 
 #include "wx/msw/private.h"
@@ -52,8 +53,12 @@ wxCursorRefData::wxCursorRefData(void)
 
 wxCursorRefData::~wxCursorRefData(void)
 {
-	if ( m_hCursor && m_destroyCursor)
-		::DestroyCursor((HICON) m_hCursor);
+    if ( m_hCursor && m_destroyCursor)
+#ifdef __WXWINE__
+        ::DestroyCursor((HCURSOR) m_hCursor);
+#else
+        ::DestroyCursor((HICON) m_hCursor);
+#endif
 }
 
 // Cursors
@@ -85,14 +90,14 @@ wxCursor::wxCursor(const wxString& cursor_file, long flags, int hotSpotX, int ho
   {
 #if wxUSE_RESOURCE_LOADING_IN_MSW
     M_CURSORDATA->m_hCursor = (WXHCURSOR) ReadCursorFile((char *)(const char *)cursor_file, wxGetInstance(), &M_CURSORDATA->m_width, &M_CURSORDATA->m_height);
-	M_CURSORDATA->m_destroyCursor = TRUE;
+    M_CURSORDATA->m_destroyCursor = TRUE;
 #endif
   }
   else if (flags & wxBITMAP_TYPE_ICO)
   {
 #if wxUSE_RESOURCE_LOADING_IN_MSW
     M_CURSORDATA->m_hCursor = (WXHCURSOR) IconToCursor((char *)(const char *)cursor_file, wxGetInstance(), hotSpotX, hotSpotY, &M_CURSORDATA->m_width, &M_CURSORDATA->m_height);
-	M_CURSORDATA->m_destroyCursor = TRUE;
+    M_CURSORDATA->m_destroyCursor = TRUE;
 #endif
   }
   else if (flags & wxBITMAP_TYPE_BMP)
@@ -109,7 +114,7 @@ wxCursor::wxCursor(const wxString& cursor_file, long flags, int hotSpotX, int ho
     pnt.x = hotSpotX;
     pnt.y = hotSpotY;
     M_CURSORDATA->m_hCursor = (WXHCURSOR) MakeCursorFromBitmap(wxGetInstance(), hBitmap, &pnt);
-	M_CURSORDATA->m_destroyCursor = TRUE;
+    M_CURSORDATA->m_destroyCursor = TRUE;
     DeleteObject(hBitmap);
     if (M_CURSORDATA->m_hCursor)
       M_CURSORDATA->m_ok = TRUE;
@@ -239,7 +244,7 @@ wxCursor::wxCursor(int cursor_type)
 
 wxCursor::~wxCursor(void)
 {
-//	FreeResource(TRUE);
+//    FreeResource(TRUE);
 }
 
 bool wxCursor::FreeResource(bool WXUNUSED(force))
@@ -247,7 +252,7 @@ bool wxCursor::FreeResource(bool WXUNUSED(force))
   if (M_CURSORDATA && M_CURSORDATA->m_hCursor && M_CURSORDATA->m_destroyCursor)
   {
     DestroyCursor((HCURSOR) M_CURSORDATA->m_hCursor);
-	M_CURSORDATA->m_hCursor = 0;
+    M_CURSORDATA->m_hCursor = 0;
   }
   return TRUE;
 }
@@ -255,7 +260,7 @@ bool wxCursor::FreeResource(bool WXUNUSED(force))
 void wxCursor::SetHCURSOR(WXHCURSOR cursor)
 {
   if ( !M_CURSORDATA )
-	m_refData = new wxCursorRefData;
+    m_refData = new wxCursorRefData;
 
   M_CURSORDATA->m_hCursor = cursor;
 }
@@ -263,12 +268,15 @@ void wxCursor::SetHCURSOR(WXHCURSOR cursor)
 // Global cursor setting
 void wxSetCursor(const wxCursor& cursor)
 {
-  extern wxCursor *g_globalCursor;
-  if ( g_globalCursor )
-    (*g_globalCursor) = cursor;
+    extern wxCursor *g_globalCursor;
+
+    if ( cursor.Ok() && cursor.GetHCURSOR() )
+    {
+        ::SetCursor((HCURSOR) cursor.GetHCURSOR());
 
-  if (cursor.Ok() && cursor.GetHCURSOR())
-    ::SetCursor((HCURSOR) cursor.GetHCURSOR());
+        if ( g_globalCursor )
+            (*g_globalCursor) = cursor;
+    }
 }