Add EVT_RIBBONGALLERY_CLICKED event.

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

diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp
index dec1344042635a7a098052156087d84973d9d633..bfa5771d24376db14d670c0a33870775bcd0aa91 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