great copy ctor/assignment operators cleanup by Paul Cornett (patch 1307665)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -70,7 +70,11 @@ public:
|
||||
|
||||
// Copy constructors
|
||||
inline wxBitmap(const wxBitmap& rBitmap)
|
||||
{ Init(); Ref(rBitmap); SetHandle(rBitmap.GetHandle()); }
|
||||
: wxGDIImage(rBitmap)
|
||||
{
|
||||
Init();
|
||||
SetHandle(rBitmap.GetHandle());
|
||||
}
|
||||
|
||||
// Initialize with raw data
|
||||
wxBitmap( const char bits[]
|
||||
@@ -112,13 +116,6 @@ public:
|
||||
inline wxBitmap(const wxIcon& rIcon)
|
||||
{ Init(); CopyFromIcon(rIcon); }
|
||||
|
||||
wxBitmap& operator=(const wxBitmap& rBitmap)
|
||||
{
|
||||
if ( m_refData != rBitmap.m_refData )
|
||||
Ref(rBitmap);
|
||||
return(*this);
|
||||
}
|
||||
|
||||
wxBitmap& operator=(const wxIcon& rIcon)
|
||||
{
|
||||
(void)CopyFromIcon(rIcon);
|
||||
|
||||
Reference in New Issue
Block a user