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

don't use wxTheXXXList in wxXXX ctor/dtor, only objects explicitly created

Browse Source 
with FindOrCreateXXX() are managed by the lists


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12799 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Gilles Depeyrot
2001-12-01 13:34:50 +00:00
parent 4f716609c9
commit 2edd0e7c66
4 changed files with 0 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/mac/bitmap.cpp
View File

@@ -367,15 +367,10 @@ bool wxBitmap::CopyFromIcon(const wxIcon& icon)
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)
@@ -437,34 +432,21 @@ wxBitmap::wxBitmap(const char bits[], int the_width, int the_height, int no_bits
{ {
wxFAIL_MSG(wxT("multicolor BITMAPs not yet implemented")); wxFAIL_MSG(wxT("multicolor BITMAPs not yet implemented"));
} }
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);
} }
bool wxBitmap::CreateFromXpm(const char **bits) bool wxBitmap::CreateFromXpm(const char **bits)
@@ -474,7 +456,6 @@ bool wxBitmap::CreateFromXpm(const char **bits)
wxImage img = decoder.ReadData(bits); wxImage img = decoder.ReadData(bits);
wxCHECK_MSG( img.Ok(), FALSE, wxT("invalid bitmap data") ) wxCHECK_MSG( img.Ok(), FALSE, wxT("invalid bitmap data") )
*this = wxBitmap(img); *this = wxBitmap(img);
if ( wxTheBitmapList ) wxTheBitmapList->AddBitmap(this);
return TRUE; return TRUE;
} }
@@ -656,8 +637,6 @@ wxBitmap::wxBitmap(const wxImage& image, int depth)
m_refData = new wxBitmapRefData(); m_refData = new wxBitmapRefData();
if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
// width and height of the device-dependent bitmap // width and height of the device-dependent bitmap
int width = image.GetWidth(); int width = image.GetWidth();
int height = image.GetHeight(); int height = image.GetHeight();

21
src/mac/carbon/bitmap.cpp
View File

@@ -367,15 +367,10 @@ bool wxBitmap::CopyFromIcon(const wxIcon& icon)
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)
@@ -437,34 +432,21 @@ wxBitmap::wxBitmap(const char bits[], int the_width, int the_height, int no_bits
{ {
wxFAIL_MSG(wxT("multicolor BITMAPs not yet implemented")); wxFAIL_MSG(wxT("multicolor BITMAPs not yet implemented"));
} }
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);
} }
bool wxBitmap::CreateFromXpm(const char **bits) bool wxBitmap::CreateFromXpm(const char **bits)
@@ -474,7 +456,6 @@ bool wxBitmap::CreateFromXpm(const char **bits)
wxImage img = decoder.ReadData(bits); wxImage img = decoder.ReadData(bits);
wxCHECK_MSG( img.Ok(), FALSE, wxT("invalid bitmap data") ) wxCHECK_MSG( img.Ok(), FALSE, wxT("invalid bitmap data") )
*this = wxBitmap(img); *this = wxBitmap(img);
if ( wxTheBitmapList ) wxTheBitmapList->AddBitmap(this);
return TRUE; return TRUE;
} }
@@ -656,8 +637,6 @@ wxBitmap::wxBitmap(const wxImage& image, int depth)
m_refData = new wxBitmapRefData(); m_refData = new wxBitmapRefData();
if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
// width and height of the device-dependent bitmap // width and height of the device-dependent bitmap
int width = image.GetWidth(); int width = image.GetWidth();
int height = image.GetHeight(); int height = image.GetHeight();

4
src/mac/carbon/font.cpp
View File

@@ -121,8 +121,6 @@ void wxFontRefData::MacFindFont()
void wxFont::Init() void wxFont::Init()
{ {
if ( wxTheFontList )
wxTheFontList->Append(this);
} }
bool wxFont::Create(const wxNativeFontInfo& info) bool wxFont::Create(const wxNativeFontInfo& info)
@@ -157,8 +155,6 @@ bool wxFont::Create(int pointSize,
wxFont::~wxFont() wxFont::~wxFont()
{ {
if (wxTheFontList)
wxTheFontList->DeleteObject(this);
} }
bool wxFont::RealizeResource() bool wxFont::RealizeResource()

4
src/mac/font.cpp
View File

@@ -121,8 +121,6 @@ void wxFontRefData::MacFindFont()
void wxFont::Init() void wxFont::Init()
{ {
if ( wxTheFontList )
wxTheFontList->Append(this);
} }
bool wxFont::Create(const wxNativeFontInfo& info) bool wxFont::Create(const wxNativeFontInfo& info)
@@ -157,8 +155,6 @@ bool wxFont::Create(int pointSize,
wxFont::~wxFont() wxFont::~wxFont()
{ {
if (wxTheFontList)
wxTheFontList->DeleteObject(this);
} }
bool wxFont::RealizeResource() bool wxFont::RealizeResource()