Add some version checks to help compiling on OSX.

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

diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp
index fbcf62dd75eb14d145e72c83acab157ea3358ff8..74f57dcf522861937a8244f41133c42830f50b8c 100644 (file)
--- a/src/msw/cursor.cpp
+++ b/src/msw/cursor.cpp
@@ -105,8 +105,7 @@ public:
 
     virtual void OnExit()
     {
 
     virtual void OnExit()
     {

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

     }
 };
 
     }
 };
 


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

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

             break;
 
 #ifndef __WXWINCE__
         case wxBITMAP_TYPE_CUR:
             break;
 
 #ifndef __WXWINCE__
         case wxBITMAP_TYPE_CUR:

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

             break;
 #endif
 
             break;
 #endif
 


@@ -349,6 +348,15 @@ void wxCursor::InitFromStock(wxStockCursor idCursor)
 
     if ( !hcursor )
     {
 
     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
         wxLogLastError(wxT("LoadCursor"));
     }
     else


@@ -383,7 +391,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));