Correct format specifiers used to show wxIPV4address.

[wxWidgets.git] / src / osx / carbon / cursor.cpp

diff --git a/src/osx/carbon/cursor.cpp b/src/osx/carbon/cursor.cpp
index 0086d4ade150e58177fe363a80e0061eca02ae9f..fddaa09533a674c57463c25317e39ac0240c8f65 100644 (file)
--- a/src/osx/carbon/cursor.cpp
+++ b/src/osx/carbon/cursor.cpp
@@ -233,12 +233,12 @@ wxCursorRefData::wxCursorRefData()
 
 wxCursorRefData::wxCursorRefData(const wxCursorRefData& cursor)
 {
 
 wxCursorRefData::wxCursorRefData(const wxCursorRefData& cursor)
 {

-    // FIXME: need to copy the cursor

     m_hCursor = NULL;
 
 #if wxOSX_USE_COCOA
     m_hCursor = NULL;
 
 #if wxOSX_USE_COCOA

-    wxUnusedVar(cursor);
+    m_hCursor = (WX_NSCursor) wxMacCocoaRetain(cursor.m_hCursor);

 #elif wxOSX_USE_CARBON
 #elif wxOSX_USE_CARBON

+    // FIXME: need to copy the cursor

     m_disposeHandle = false;
     m_releaseHandle = false;
     m_isColorCursor = cursor.m_isColorCursor;
     m_disposeHandle = false;
     m_releaseHandle = false;
     m_isColorCursor = cursor.m_isColorCursor;


@@ -281,11 +281,6 @@ wxCursor::wxCursor( const wxImage &image )
 #endif
 }
 
 #endif
 }
 

-wxCursor::wxCursor(const char* const* bits)
-{
-    (void) CreateFromXpm(bits);
-}
-

 wxGDIRefData *wxCursor::CreateGDIRefData() const
 {
     return new wxCursorRefData;
 wxGDIRefData *wxCursor::CreateGDIRefData() const
 {
     return new wxCursorRefData;


@@ -296,20 +291,6 @@ wxGDIRefData *wxCursor::CloneGDIRefData(const wxGDIRefData *data) const
     return new wxCursorRefData(*static_cast<const wxCursorRefData *>(data));
 }
 
     return new wxCursorRefData(*static_cast<const wxCursorRefData *>(data));
 }
 

-bool wxCursor::CreateFromXpm(const char* const* bits)
-{
-#if wxUSE_IMAGE
-    wxCHECK_MSG( bits != NULL, false, wxT("invalid cursor data") );
-    wxXPMDecoder decoder;
-    wxImage img = decoder.ReadData(bits);
-    wxCHECK_MSG( img.Ok(), false, wxT("invalid cursor data") );
-    CreateFromImage( img ) ;
-    return true;
-#else
-    return false;
-#endif
-}
-

 WXHCURSOR wxCursor::GetHCURSOR() const
 {
     return (M_CURSORDATA ? M_CURSORDATA->m_hCursor : 0);
 WXHCURSOR wxCursor::GetHCURSOR() const
 {
     return (M_CURSORDATA ? M_CURSORDATA->m_hCursor : 0);


@@ -654,7 +635,7 @@ void wxCursor::InitFromStock(wxStockCursor cursor_type)
     case wxCURSOR_CLOSED_HAND:
         M_CURSORDATA->m_themeCursor = kThemeClosedHandCursor;
         break;
     case wxCURSOR_CLOSED_HAND:
         M_CURSORDATA->m_themeCursor = kThemeClosedHandCursor;
         break;

-        
+

     case wxCURSOR_CHAR:
     case wxCURSOR_ARROW:
     case wxCURSOR_LEFT_BUTTON:
     case wxCURSOR_CHAR:
     case wxCURSOR_ARROW:
     case wxCURSOR_LEFT_BUTTON: