don't append anything back in DoDeleteOneItem() if the control becomes empty (fixes...

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

diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp
index 3a6a3e9e80849b49cae25b425bf97ef49f171915..5e0bb783f9277d6dd82cdc0068f99d25edea90dc 100644 (file)
--- a/src/msw/cursor.cpp
+++ b/src/msw/cursor.cpp
@@ -24,19 +24,19 @@
     #pragma hdrstop
 #endif
 
+#include "wx/cursor.h"
+
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/bitmap.h"
     #include "wx/icon.h"
-    #include "wx/cursor.h"
     #include "wx/settings.h"
     #include "wx/intl.h"
+    #include "wx/image.h"
+    #include "wx/module.h"
 #endif
 
-#include "wx/module.h"
-#include "wx/image.h"
-
 #include "wx/msw/private.h"
 #include "wx/msw/missing.h" // IDC_HAND
 
@@ -209,19 +209,15 @@ wxCursor::wxCursor(const wxImage& image)
     HCURSOR hcursor = wxBitmapToHCURSOR( wxBitmap(imageSized),
                                          hotSpotX, hotSpotY );
 
-#if wxUSE_WXDIB
     if ( !hcursor )
     {
         wxLogWarning(_("Failed to create cursor."));
         return;
     }
-#else
-    HCURSOR hcursor = 0;
-#endif                                         
 
     m_refData = new wxCursorRefData(hcursor, true /* delete it later */);
 }
-#endif
+#endif // wxUSE_IMAGE
 
 wxCursor::wxCursor(const char WXUNUSED(bits)[],
                    int WXUNUSED(width),
@@ -256,12 +252,12 @@ wxCursor::wxCursor(const wxString& filename,
     switch ( kind )
     {
         case wxBITMAP_TYPE_CUR_RESOURCE:
-            hcursor = ::LoadCursor(wxGetInstance(), filename);
+            hcursor = ::LoadCursor(wxGetInstance(), filename.fn_str());
             break;
 
 #ifndef __WXWINCE__
         case wxBITMAP_TYPE_CUR:
-            hcursor = ::LoadCursorFromFile(filename);
+            hcursor = ::LoadCursorFromFile(filename.fn_str());
             break;
 #endif
 
@@ -313,7 +309,7 @@ wxCursor::wxCursor(int idCursor)
         { false, _T("WXCURSOR_RIGHT_ARROW")  }, // wxCURSOR_RIGHT_ARROW
         { false, _T("WXCURSOR_BULLSEYE")     }, // wxCURSOR_BULLSEYE
         {  true, IDC_ARROW                   }, // WXCURSOR_CHAR
-        
+
         // Displays as an I-beam on XP, so use a cursor file
 //        {  true, IDC_CROSS                   }, // WXCURSOR_CROSS
         {  false, _T("WXCURSOR_CROSS")       }, // WXCURSOR_CROSS
@@ -321,7 +317,7 @@ wxCursor::wxCursor(int idCursor)
         // See special handling below for wxCURSOR_HAND
 //        { false, _T("WXCURSOR_HAND")         }, // wxCURSOR_HAND
         {  true, IDC_HAND                    }, // wxCURSOR_HAND
-        
+
         {  true, IDC_IBEAM                   }, // WXCURSOR_IBEAM
         {  true, IDC_ARROW                   }, // WXCURSOR_LEFT_BUTTON
         { false, _T("WXCURSOR_MAGNIFIER")    }, // wxCURSOR_MAGNIFIER
@@ -365,7 +361,7 @@ wxCursor::wxCursor(int idCursor)
         hcursor = ::LoadCursor(wxGetInstance(), _T("WXCURSOR_HAND"));
         deleteLater = true;
     }
-    
+
     if ( !hcursor )
     {
         wxLogLastError(_T("LoadCursor"));
@@ -386,16 +382,6 @@ wxCursor::~wxCursor()
 // other wxCursor functions
 // ----------------------------------------------------------------------------
 
-bool wxCursor::operator==(const wxCursor& cursor) const
-{
-    if ( !m_refData )
-        return !cursor.m_refData;
-
-    return cursor.m_refData &&
-                ((wxCursorRefData *)m_refData)->m_hCursor ==
-                ((wxCursorRefData *)cursor.m_refData)->m_hCursor;
-}
-
 wxGDIImageRefData *wxCursor::CreateData() const
 {
     return new wxCursorRefData;
@@ -420,5 +406,3 @@ void wxSetCursor(const wxCursor& cursor)
             *gs_globalCursor = cursor;
     }
 }
-
-