Removed wxTheBitmapList code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22593 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
568cdf9c4c
commit
29c310fe05
@ -92,15 +92,10 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject)
|
|||||||
wxBitmap::wxBitmap()
|
wxBitmap::wxBitmap()
|
||||||
{
|
{
|
||||||
m_refData = NULL;
|
m_refData = NULL;
|
||||||
|
|
||||||
if ( wxTheBitmapList )
|
|
||||||
wxTheBitmapList->AddBitmap(this);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
wxBitmap::~wxBitmap()
|
wxBitmap::~wxBitmap()
|
||||||
{
|
{
|
||||||
if (wxTheBitmapList)
|
|
||||||
wxTheBitmapList->DeleteObject(this);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
wxBitmap::wxBitmap(const char bits[], int the_width, int the_height, int no_bits)
|
wxBitmap::wxBitmap(const char bits[], int the_width, int the_height, int no_bits)
|
||||||
@ -113,33 +108,21 @@ wxBitmap::wxBitmap(const char bits[], int the_width, int the_height, int no_bits
|
|||||||
M_BITMAPDATA->m_numColors = 0;
|
M_BITMAPDATA->m_numColors = 0;
|
||||||
|
|
||||||
/* TODO: create the bitmap from data */
|
/* TODO: create the bitmap from data */
|
||||||
|
|
||||||
if ( wxTheBitmapList )
|
|
||||||
wxTheBitmapList->AddBitmap(this);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
wxBitmap::wxBitmap(int w, int h, int d)
|
wxBitmap::wxBitmap(int w, int h, int d)
|
||||||
{
|
{
|
||||||
(void)Create(w, h, d);
|
(void)Create(w, h, d);
|
||||||
|
|
||||||
if ( wxTheBitmapList )
|
|
||||||
wxTheBitmapList->AddBitmap(this);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
wxBitmap::wxBitmap(void *data, wxBitmapType type, int width, int height, int depth)
|
wxBitmap::wxBitmap(void *data, wxBitmapType type, int width, int height, int depth)
|
||||||
{
|
{
|
||||||
(void) Create(data, type, width, height, depth);
|
(void) Create(data, type, width, height, depth);
|
||||||
|
|
||||||
if ( wxTheBitmapList )
|
|
||||||
wxTheBitmapList->AddBitmap(this);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
wxBitmap::wxBitmap(const wxString& filename, wxBitmapType type)
|
wxBitmap::wxBitmap(const wxString& filename, wxBitmapType type)
|
||||||
{
|
{
|
||||||
LoadFile(filename, type);
|
LoadFile(filename, type);
|
||||||
|
|
||||||
if ( wxTheBitmapList )
|
|
||||||
wxTheBitmapList->AddBitmap(this);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
wxObjectRefData *wxBitmap::CreateRefData() const
|
wxObjectRefData *wxBitmap::CreateRefData() const
|
||||||
|
Loading…
Reference in New Issue
Block a user