Generate key events in generic wxDataViewCtrl implementation.

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

diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp
index fbcf62dd75eb14d145e72c83acab157ea3358ff8..a83979575821a74ca425ef2e8a8eb76c4e847675 100644 (file)
--- a/src/msw/cursor.cpp
+++ b/src/msw/cursor.cpp
@@ -105,8 +105,7 @@ public:
 
     virtual void OnExit()
     {
-        delete gs_globalCursor;
-        gs_globalCursor = NULL;
+        wxDELETE(gs_globalCursor);
     }
 };
 
@@ -349,6 +348,15 @@ void wxCursor::InitFromStock(wxStockCursor idCursor)
 
     if ( !hcursor )
     {
+        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