Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'mac-cleanup'

Browse Source 
Remove unused variable and consistent usage of NULL.

Closes https://github.com/wxWidgets/wxWidgets/pull/1921
This commit is contained in:
Vadim Zeitlin
2020-07-02 16:06:59 +02:00
parent 1c209f113f bfca375f17
commit b35ef94a72
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/osx/dataobj2.h
View File

@@ -53,7 +53,6 @@ protected :
void Clear() ; void Clear() ;
CFDataRef m_pictData ; CFDataRef m_pictData ;
bool m_pictCreated ;
}; };
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

4
src/osx/carbon/dataobj.cpp
View File

@@ -659,7 +659,6 @@ void wxBitmapDataObject::SetBitmap( const wxBitmap& rBitmap )
void wxBitmapDataObject::Init() void wxBitmapDataObject::Init()
{ {
m_pictData = NULL; m_pictData = NULL;
m_pictCreated = false;
} }
void wxBitmapDataObject::Clear() void wxBitmapDataObject::Clear()
@@ -669,7 +668,6 @@ void wxBitmapDataObject::Clear()
CFRelease( m_pictData ); CFRelease( m_pictData );
m_pictData = NULL; m_pictData = NULL;
} }
m_pictCreated = false;
} }
bool wxBitmapDataObject::GetDataHere( void *pBuf ) const bool wxBitmapDataObject::GetDataHere( void *pBuf ) const
@@ -703,7 +701,7 @@ bool wxBitmapDataObject::SetData( size_t nSize, const void *pBuf )
if ((pBuf == NULL) || (nSize == 0)) if ((pBuf == NULL) || (nSize == 0))
return false; return false;
CGImageRef cgImageRef = 0; CGImageRef cgImageRef = NULL;
CFDataRef data = CFDataCreate( kCFAllocatorDefault, (const UInt8*) pBuf, nSize); CFDataRef data = CFDataCreate( kCFAllocatorDefault, (const UInt8*) pBuf, nSize);
CGImageSourceRef source = CGImageSourceCreateWithData( data, NULL ); CGImageSourceRef source = CGImageSourceCreateWithData( data, NULL );