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

with FindOrCreateXXX() are managed by the lists

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12799 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/bitmap.cpp b/src/mac/bitmap.cpp
index 95bc8f16120161eea51a9fbd859c220adab771f7..688ce82584faf0c922851e04d6a7e9de541c4df1 100644 (file)
--- a/src/mac/bitmap.cpp
+++ b/src/mac/bitmap.cpp
@@ -367,15 +367,10 @@ bool wxBitmap::CopyFromIcon(const wxIcon& icon)
 wxBitmap::wxBitmap()
 {
     m_refData = NULL;
 wxBitmap::wxBitmap()
 {
     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)
 {
     (void)Create(w, h, d);
 }
 
 wxBitmap::wxBitmap(int w, int h, int d)
 {
     (void)Create(w, h, d);

-
-    if ( wxTheBitmapList )
-        wxTheBitmapList->AddBitmap(this);

 }
 
 wxBitmap::wxBitmap(void *data, wxBitmapType type, int width, int height, int depth)
 {
     (void) Create(data, type, width, height, depth);
 }
 
 wxBitmap::wxBitmap(void *data, wxBitmapType type, int width, int height, int depth)
 {
     (void) Create(data, type, width, height, depth);

-
-    if ( wxTheBitmapList )
-        wxTheBitmapList->AddBitmap(this);

 }
 
 wxBitmap::wxBitmap(const wxString& filename, wxBitmapType type)
 {
     LoadFile(filename, type);
 }
 
 wxBitmap::wxBitmap(const wxString& filename, wxBitmapType 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);
     wxCHECK_MSG( img.Ok(), FALSE, wxT("invalid bitmap data") )    
     *this = wxBitmap(img);   
     wxImage img = decoder.ReadData(bits);
     wxCHECK_MSG( img.Ok(), FALSE, wxT("invalid bitmap data") )    
     *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
     int width = image.GetWidth();
     int height = image.GetHeight();
     // width and height of the device-dependent bitmap
     int width = image.GetWidth();
     int height = image.GetHeight();

diff --git a/src/mac/carbon/bitmap.cpp b/src/mac/carbon/bitmap.cpp
index 95bc8f16120161eea51a9fbd859c220adab771f7..688ce82584faf0c922851e04d6a7e9de541c4df1 100644 (file)
--- a/src/mac/carbon/bitmap.cpp
+++ b/src/mac/carbon/bitmap.cpp
@@ -367,15 +367,10 @@ bool wxBitmap::CopyFromIcon(const wxIcon& icon)
 wxBitmap::wxBitmap()
 {
     m_refData = NULL;
 wxBitmap::wxBitmap()
 {
     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)
 {
     (void)Create(w, h, d);
 }
 
 wxBitmap::wxBitmap(int w, int h, int d)
 {
     (void)Create(w, h, d);

-
-    if ( wxTheBitmapList )
-        wxTheBitmapList->AddBitmap(this);

 }
 
 wxBitmap::wxBitmap(void *data, wxBitmapType type, int width, int height, int depth)
 {
     (void) Create(data, type, width, height, depth);
 }
 
 wxBitmap::wxBitmap(void *data, wxBitmapType type, int width, int height, int depth)
 {
     (void) Create(data, type, width, height, depth);

-
-    if ( wxTheBitmapList )
-        wxTheBitmapList->AddBitmap(this);

 }
 
 wxBitmap::wxBitmap(const wxString& filename, wxBitmapType type)
 {
     LoadFile(filename, type);
 }
 
 wxBitmap::wxBitmap(const wxString& filename, wxBitmapType 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);
     wxCHECK_MSG( img.Ok(), FALSE, wxT("invalid bitmap data") )    
     *this = wxBitmap(img);   
     wxImage img = decoder.ReadData(bits);
     wxCHECK_MSG( img.Ok(), FALSE, wxT("invalid bitmap data") )    
     *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
     int width = image.GetWidth();
     int height = image.GetHeight();
     // width and height of the device-dependent bitmap
     int width = image.GetWidth();
     int height = image.GetHeight();

diff --git a/src/mac/carbon/font.cpp b/src/mac/carbon/font.cpp
index d425b3cf95f1718e3cfd96704a48c1019afaface..2d3e5f903323941659823fdcf20d417a6eeff51d 100644 (file)
--- a/src/mac/carbon/font.cpp
+++ b/src/mac/carbon/font.cpp
@@ -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()

diff --git a/src/mac/font.cpp b/src/mac/font.cpp
index d425b3cf95f1718e3cfd96704a48c1019afaface..2d3e5f903323941659823fdcf20d417a6eeff51d 100644 (file)
--- a/src/mac/font.cpp
+++ b/src/mac/font.cpp
@@ -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()