From 1676d52d2bd98ab7b4e513c7f3b3b65f81a424c9 Mon Sep 17 00:00:00 2001 From: Hertatijanto Hartono Date: Thu, 2 Jul 2020 08:30:17 +0700 Subject: [PATCH 1/2] Use NULL, not 0, for CGImageRef initialization No real changes, just improve consistency. --- src/osx/carbon/dataobj.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osx/carbon/dataobj.cpp b/src/osx/carbon/dataobj.cpp index 010b6affd4..e9006fc55e 100644 --- a/src/osx/carbon/dataobj.cpp +++ b/src/osx/carbon/dataobj.cpp @@ -703,7 +703,7 @@ bool wxBitmapDataObject::SetData( size_t nSize, const void *pBuf ) if ((pBuf == NULL) || (nSize == 0)) return false; - CGImageRef cgImageRef = 0; + CGImageRef cgImageRef = NULL; CFDataRef data = CFDataCreate( kCFAllocatorDefault, (const UInt8*) pBuf, nSize); CGImageSourceRef source = CGImageSourceCreateWithData( data, NULL ); From bfca375f1745bee31d458efeef0855480dd55d86 Mon Sep 17 00:00:00 2001 From: Hertatijanto Hartono Date: Thu, 2 Jul 2020 08:30:17 +0700 Subject: [PATCH 2/2] Remove unused wxBitmapDataObject::m_pictCreated This variable was initialized, but never used, so just remove it. --- include/wx/osx/dataobj2.h | 1 - src/osx/carbon/dataobj.cpp | 2 -- 2 files changed, 3 deletions(-) diff --git a/include/wx/osx/dataobj2.h b/include/wx/osx/dataobj2.h index 83011b852d..46fdc484f6 100644 --- a/include/wx/osx/dataobj2.h +++ b/include/wx/osx/dataobj2.h @@ -53,7 +53,6 @@ protected : void Clear() ; CFDataRef m_pictData ; - bool m_pictCreated ; }; // ---------------------------------------------------------------------------- diff --git a/src/osx/carbon/dataobj.cpp b/src/osx/carbon/dataobj.cpp index e9006fc55e..35582cb88d 100644 --- a/src/osx/carbon/dataobj.cpp +++ b/src/osx/carbon/dataobj.cpp @@ -659,7 +659,6 @@ void wxBitmapDataObject::SetBitmap( const wxBitmap& rBitmap ) void wxBitmapDataObject::Init() { m_pictData = NULL; - m_pictCreated = false; } void wxBitmapDataObject::Clear() @@ -669,7 +668,6 @@ void wxBitmapDataObject::Clear() CFRelease( m_pictData ); m_pictData = NULL; } - m_pictCreated = false; } bool wxBitmapDataObject::GetDataHere( void *pBuf ) const