Changed system colours for better default display of wxGrid. Please revert

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

diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp
index 706b97fb922af1e15c08c35d3fcf564f896b742f..e914dff561f34c9f134cba6ed08ab95e866198b7 100644 (file)
--- a/src/msw/cursor.cpp
+++ b/src/msw/cursor.cpp
@@ -32,8 +32,9 @@
     #include "wx/list.h"
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/list.h"
     #include "wx/utils.h"
     #include "wx/app.h"

-    #include "wx/cursor.h"
+    #include "wx/bitmap.h"

     #include "wx/icon.h"
     #include "wx/icon.h"

+    #include "wx/cursor.h"

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


@@ -48,9 +49,7 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
 // wxWin macros
 // ----------------------------------------------------------------------------
 

-#if !USE_SHARED_LIBRARIES

     IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxCursorBase)
     IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxCursorBase)

-#endif

 
 // ----------------------------------------------------------------------------
 // wxCursorRefData
 
 // ----------------------------------------------------------------------------
 // wxCursorRefData


@@ -66,8 +65,13 @@ wxCursorRefData::wxCursorRefData()
 
 void wxCursorRefData::Free()
 {
 
 void wxCursorRefData::Free()
 {

-    if ( m_hCursor && m_destroyCursor )
-        ::DestroyCursor((HCURSOR)m_hCursor);
+    if ( m_hCursor )
+    {
+        if ( m_destroyCursor )
+            ::DestroyCursor((HCURSOR)m_hCursor);
+
+        m_hCursor = 0;
+    }

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------