don't use annoying and unneeded in C++ casts of NULL to "T *" in all other files neither
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1175,13 +1175,13 @@ wxBitmap wxBitmap::GetSubBitmapOfHDC( const wxRect& rect, WXHDC hdc ) const
|
||||
wxPalette* wxBitmap::GetPalette() const
|
||||
{
|
||||
return GetBitmapData() ? &GetBitmapData()->m_bitmapPalette
|
||||
: (wxPalette *) NULL;
|
||||
: NULL;
|
||||
}
|
||||
#endif
|
||||
|
||||
wxMask *wxBitmap::GetMask() const
|
||||
{
|
||||
return GetBitmapData() ? GetBitmapData()->GetMask() : (wxMask *) NULL;
|
||||
return GetBitmapData() ? GetBitmapData()->GetMask() : NULL;
|
||||
}
|
||||
|
||||
wxBitmap wxBitmap::GetMaskBitmap() const
|
||||
@@ -1197,7 +1197,7 @@ wxBitmap wxBitmap::GetMaskBitmap() const
|
||||
|
||||
wxDC *wxBitmap::GetSelectedInto() const
|
||||
{
|
||||
return GetBitmapData() ? GetBitmapData()->m_selectedInto : (wxDC *) NULL;
|
||||
return GetBitmapData() ? GetBitmapData()->m_selectedInto : NULL;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user