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@12527 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-11-20 18:40:03 +00:00
parent 636d266b89
commit 7ecb8b06ad
18 changed files with 122 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/common/gdicmn.cpp
View File

@@ -418,7 +418,8 @@ wxString wxColourDatabase::FindName (const wxColour& colour) const
return name; return name;
} }
void wxInitializeStockLists () { void wxInitializeStockLists()
{
wxTheBrushList = new wxBrushList; wxTheBrushList = new wxBrushList;
wxThePenList = new wxPenList; wxThePenList = new wxPenList;
wxTheFontList = new wxFontList; wxTheFontList = new wxFontList;
@@ -530,14 +531,19 @@ void wxDeleteStockObjects ()
wxDELETE(wxCROSS_CURSOR); wxDELETE(wxCROSS_CURSOR);
} }
void wxDeleteStockLists() { void wxDeleteStockLists()
{
wxDELETE(wxTheBrushList); wxDELETE(wxTheBrushList);
wxDELETE(wxThePenList); wxDELETE(wxThePenList);
wxDELETE(wxTheFontList); wxDELETE(wxTheFontList);
wxDELETE(wxTheBitmapList); wxDELETE(wxTheBitmapList);
} }
wxBitmapList::wxBitmapList () // ============================================================================
// wxTheXXXList stuff (semi-obsolete)
// ============================================================================
wxBitmapList::wxBitmapList()
{ {
} }
@@ -602,10 +608,9 @@ wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, int width, int style)
return NULL; return NULL;
} }
// Yes, we can return a pointer to this in a later FindOrCreatePen call, AddPen(pen);
// because we created it within FindOrCreatePen. Safeguards against
// returning a pointer to an automatic variable and hanging on to it // we'll delete it ourselves later
// (dangling pointer).
pen->SetVisible(TRUE); pen->SetVisible(TRUE);
return pen; return pen;
@@ -653,12 +658,11 @@ wxBrush *wxBrushList::FindOrCreateBrush (const wxColour& colour, int style)
return NULL; return NULL;
} }
AddBrush(brush);
// we'll delete it ourselves later
brush->SetVisible(TRUE); brush->SetVisible(TRUE);
// Yes, we can return a pointer to this in a later FindOrCreateBrush call,
// because we created it within FindOrCreateBrush. Safeguards against
// returning a pointer to an automatic variable and hanging on to it
// (dangling pointer).
return brush; return brush;
} }
@@ -759,6 +763,8 @@ wxFont *wxFontList::FindOrCreateFont(int pointSize,
font = new wxFont(pointSize, family, style, weight, font = new wxFont(pointSize, family, style, weight,
underline, facename, encoding); underline, facename, encoding);
AddFont(font);
// and mark it as being cacheable // and mark it as being cacheable
font->SetVisible(TRUE); font->SetVisible(TRUE);
} }

19
src/gtk/bitmap.cpp
View File

@@ -255,14 +255,11 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxGDIObject)
wxBitmap::wxBitmap() wxBitmap::wxBitmap()
{ {
if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
} }
wxBitmap::wxBitmap( int width, int height, int depth ) wxBitmap::wxBitmap( int width, int height, int depth )
{ {
Create( width, height, depth ); Create( width, height, depth );
if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
} }
bool wxBitmap::Create( int width, int height, int depth ) bool wxBitmap::Create( int width, int height, int depth )
@@ -322,8 +319,6 @@ bool wxBitmap::CreateFromXpm( const char **bits )
M_BMPDATA->m_bpp = visual->depth; // ? M_BMPDATA->m_bpp = visual->depth; // ?
if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
return TRUE; return TRUE;
} }
@@ -334,8 +329,6 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
m_refData = new wxBitmapRefData(); m_refData = new wxBitmapRefData();
if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
// ------ // ------
// convertion to mono bitmap: // convertion to mono bitmap:
// ------ // ------
@@ -774,15 +767,11 @@ wxImage wxBitmap::ConvertToImage() const
wxBitmap::wxBitmap( const wxBitmap& bmp ) wxBitmap::wxBitmap( const wxBitmap& bmp )
{ {
Ref( bmp ); Ref( bmp );
if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
} }
wxBitmap::wxBitmap( const wxString &filename, int type ) wxBitmap::wxBitmap( const wxString &filename, int type )
{ {
LoadFile( filename, type ); LoadFile( filename, type );
if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
} }
wxBitmap::wxBitmap( const char bits[], int width, int height, int WXUNUSED(depth)) wxBitmap::wxBitmap( const char bits[], int width, int height, int WXUNUSED(depth))
@@ -797,19 +786,17 @@ wxBitmap::wxBitmap( const char bits[], int width, int height, int WXUNUSED(depth
M_BMPDATA->m_bpp = 1; M_BMPDATA->m_bpp = 1;
wxCHECK_RET( M_BMPDATA->m_bitmap, wxT("couldn't create bitmap") ); wxCHECK_RET( M_BMPDATA->m_bitmap, wxT("couldn't create bitmap") );
if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
} }
wxBitmap::~wxBitmap() wxBitmap::~wxBitmap()
{ {
if (wxTheBitmapList) wxTheBitmapList->DeleteObject(this);
} }
wxBitmap& wxBitmap::operator = ( const wxBitmap& bmp ) wxBitmap& wxBitmap::operator = ( const wxBitmap& bmp )
{ {
if (*this == bmp) return (*this); if ( m_refData != bmp.m_refData )
Ref( bmp ); Ref( bmp );
return *this; return *this;
} }

37
src/gtk/brush.cpp
View File

@@ -1,10 +1,10 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: brush.cpp // Name: src/gtk/brush.cpp
// Purpose: // Purpose:
// Author: Robert Roebling // Author: Robert Roebling
// Id: $Id$ // Id: $Id$
// Copyright: (c) 1998 Robert Roebling // Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__ #ifdef __GNUG__
@@ -50,7 +50,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxBrush,wxGDIObject)
wxBrush::wxBrush() wxBrush::wxBrush()
{ {
if (wxTheBrushList) wxTheBrushList->AddBrush( this );
} }
wxBrush::wxBrush( const wxColour &colour, int style ) wxBrush::wxBrush( const wxColour &colour, int style )
@@ -58,41 +57,35 @@ wxBrush::wxBrush( const wxColour &colour, int style )
m_refData = new wxBrushRefData(); m_refData = new wxBrushRefData();
M_BRUSHDATA->m_style = style; M_BRUSHDATA->m_style = style;
M_BRUSHDATA->m_colour = colour; M_BRUSHDATA->m_colour = colour;
if (wxTheBrushList) wxTheBrushList->AddBrush( this );
} }
wxBrush::wxBrush( const wxBitmap &stippleBitmap ) wxBrush::wxBrush( const wxBitmap &stippleBitmap )
{ {
m_refData = new wxBrushRefData(); m_refData = new wxBrushRefData();
M_BRUSHDATA->m_colour = *wxBLACK; M_BRUSHDATA->m_colour = *wxBLACK;
M_BRUSHDATA->m_stipple = stippleBitmap; M_BRUSHDATA->m_stipple = stippleBitmap;
if (M_BRUSHDATA->m_stipple.GetMask()) if (M_BRUSHDATA->m_stipple.GetMask())
M_BRUSHDATA->m_style = wxSTIPPLE_MASK_OPAQUE; M_BRUSHDATA->m_style = wxSTIPPLE_MASK_OPAQUE;
else else
M_BRUSHDATA->m_style = wxSTIPPLE; M_BRUSHDATA->m_style = wxSTIPPLE;
if (wxTheBrushList) wxTheBrushList->AddBrush( this );
} }
wxBrush::wxBrush( const wxBrush &brush ) wxBrush::wxBrush( const wxBrush &brush )
{ {
Ref( brush ); Ref( brush );
if (wxTheBrushList) wxTheBrushList->AddBrush( this );
} }
wxBrush::~wxBrush() wxBrush::~wxBrush()
{ {
if (wxTheBrushList) wxTheBrushList->RemoveBrush( this );
} }
wxBrush& wxBrush::operator = ( const wxBrush& brush ) wxBrush& wxBrush::operator = ( const wxBrush& brush )
{ {
if (*this == brush) return (*this); if ( m_refData != brush.m_refData )
Ref( brush ); Ref( brush );
return *this; return *this;
} }
@@ -168,12 +161,12 @@ void wxBrush::SetStipple( const wxBitmap& stipple )
M_BRUSHDATA->m_stipple = stipple; M_BRUSHDATA->m_stipple = stipple;
if (M_BRUSHDATA->m_stipple.GetMask()) if (M_BRUSHDATA->m_stipple.GetMask())
{ {
M_BRUSHDATA->m_style = wxSTIPPLE_MASK_OPAQUE; M_BRUSHDATA->m_style = wxSTIPPLE_MASK_OPAQUE;
} }
else else
{ {
M_BRUSHDATA->m_style = wxSTIPPLE; M_BRUSHDATA->m_style = wxSTIPPLE;
} }
} }
void wxBrush::Unshare() void wxBrush::Unshare()

10
src/gtk/font.cpp
View File

@@ -162,18 +162,18 @@ bool wxNativeFontInfo::FromString(const wxString& s)
xFontName = tokenizer.GetNextToken(); xFontName = tokenizer.GetNextToken();
if(!xFontName) if(!xFontName)
return FALSE; return FALSE;
return TRUE; return TRUE;
} }
wxString wxNativeFontInfo::ToString() const wxString wxNativeFontInfo::ToString() const
{ {
wxString s; wxString s;
s.Printf(_T("%d;%s"), s.Printf(_T("%d;%s"),
0, // version 0, // version
xFontName.c_str()); xFontName.c_str());
return s; return s;
} }
@@ -185,8 +185,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
void wxFont::Init() void wxFont::Init()
{ {
if (wxTheFontList)
wxTheFontList->Append( this );
} }
wxFont::wxFont(const wxNativeFontInfo& info) wxFont::wxFont(const wxNativeFontInfo& info)
@@ -334,8 +332,6 @@ void wxFont::Unshare()
wxFont::~wxFont() wxFont::~wxFont()
{ {
if (wxTheFontList)
wxTheFontList->DeleteObject( this );
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

28
src/gtk/pen.cpp
View File

@@ -56,7 +56,7 @@ wxPenRefData::wxPenRefData( const wxPenRefData& data )
m_countDashes = data.m_countDashes; m_countDashes = data.m_countDashes;
/* /*
if (data.m_dash) TODO if (data.m_dash) TODO
m_dash = new m_dash = new
*/ */
m_dash = data.m_dash; m_dash = data.m_dash;
} }
@@ -69,7 +69,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxPen,wxGDIObject)
wxPen::wxPen() wxPen::wxPen()
{ {
if (wxThePenList) wxThePenList->AddPen( this );
} }
wxPen::wxPen( const wxColour &colour, int width, int style ) wxPen::wxPen( const wxColour &colour, int width, int style )
@@ -78,25 +77,22 @@ wxPen::wxPen( const wxColour &colour, int width, int style )
M_PENDATA->m_width = width; M_PENDATA->m_width = width;
M_PENDATA->m_style = style; M_PENDATA->m_style = style;
M_PENDATA->m_colour = colour; M_PENDATA->m_colour = colour;
if (wxThePenList) wxThePenList->AddPen( this );
} }
wxPen::wxPen( const wxPen& pen ) wxPen::wxPen( const wxPen& pen )
{ {
Ref( pen ); Ref( pen );
if (wxThePenList) wxThePenList->AddPen( this );
} }
wxPen::~wxPen() wxPen::~wxPen()
{ {
if (wxThePenList) wxThePenList->RemovePen( this );
} }
wxPen& wxPen::operator = ( const wxPen& pen ) wxPen& wxPen::operator = ( const wxPen& pen )
{ {
if (*this == pen) return (*this); if ( m_refData != pen.m_refData )
Ref( pen ); Ref( pen );
return *this; return *this;
} }
@@ -153,20 +149,20 @@ void wxPen::SetWidth( int width )
M_PENDATA->m_width = width; M_PENDATA->m_width = width;
} }
int wxPen::GetDashes( wxDash **ptr ) const int wxPen::GetDashes( wxDash **ptr ) const
{ {
*ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*) NULL); *ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*) NULL);
return (M_PENDATA ? M_PENDATA->m_countDashes : 0); return (M_PENDATA ? M_PENDATA->m_countDashes : 0);
} }
int wxPen::GetDashCount() const int wxPen::GetDashCount() const
{ {
return (M_PENDATA->m_countDashes); return (M_PENDATA->m_countDashes);
} }
wxDash* wxPen::GetDash() const wxDash* wxPen::GetDash() const
{ {
return (wxDash*)M_PENDATA->m_dash; return (wxDash*)M_PENDATA->m_dash;
} }
int wxPen::GetCap() const int wxPen::GetCap() const

19
src/gtk1/bitmap.cpp
View File

@@ -255,14 +255,11 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxGDIObject)
wxBitmap::wxBitmap() wxBitmap::wxBitmap()
{ {
if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
} }
wxBitmap::wxBitmap( int width, int height, int depth ) wxBitmap::wxBitmap( int width, int height, int depth )
{ {
Create( width, height, depth ); Create( width, height, depth );
if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
} }
bool wxBitmap::Create( int width, int height, int depth ) bool wxBitmap::Create( int width, int height, int depth )
@@ -322,8 +319,6 @@ bool wxBitmap::CreateFromXpm( const char **bits )
M_BMPDATA->m_bpp = visual->depth; // ? M_BMPDATA->m_bpp = visual->depth; // ?
if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
return TRUE; return TRUE;
} }
@@ -334,8 +329,6 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
m_refData = new wxBitmapRefData(); m_refData = new wxBitmapRefData();
if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
// ------ // ------
// convertion to mono bitmap: // convertion to mono bitmap:
// ------ // ------
@@ -774,15 +767,11 @@ wxImage wxBitmap::ConvertToImage() const
wxBitmap::wxBitmap( const wxBitmap& bmp ) wxBitmap::wxBitmap( const wxBitmap& bmp )
{ {
Ref( bmp ); Ref( bmp );
if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
} }
wxBitmap::wxBitmap( const wxString &filename, int type ) wxBitmap::wxBitmap( const wxString &filename, int type )
{ {
LoadFile( filename, type ); LoadFile( filename, type );
if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
} }
wxBitmap::wxBitmap( const char bits[], int width, int height, int WXUNUSED(depth)) wxBitmap::wxBitmap( const char bits[], int width, int height, int WXUNUSED(depth))
@@ -797,19 +786,17 @@ wxBitmap::wxBitmap( const char bits[], int width, int height, int WXUNUSED(depth
M_BMPDATA->m_bpp = 1; M_BMPDATA->m_bpp = 1;
wxCHECK_RET( M_BMPDATA->m_bitmap, wxT("couldn't create bitmap") ); wxCHECK_RET( M_BMPDATA->m_bitmap, wxT("couldn't create bitmap") );
if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
} }
wxBitmap::~wxBitmap() wxBitmap::~wxBitmap()
{ {
if (wxTheBitmapList) wxTheBitmapList->DeleteObject(this);
} }
wxBitmap& wxBitmap::operator = ( const wxBitmap& bmp ) wxBitmap& wxBitmap::operator = ( const wxBitmap& bmp )
{ {
if (*this == bmp) return (*this); if ( m_refData != bmp.m_refData )
Ref( bmp ); Ref( bmp );
return *this; return *this;
} }

37
src/gtk1/brush.cpp
View File

@@ -1,10 +1,10 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: brush.cpp // Name: src/gtk/brush.cpp
// Purpose: // Purpose:
// Author: Robert Roebling // Author: Robert Roebling
// Id: $Id$ // Id: $Id$
// Copyright: (c) 1998 Robert Roebling // Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__ #ifdef __GNUG__
@@ -50,7 +50,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxBrush,wxGDIObject)
wxBrush::wxBrush() wxBrush::wxBrush()
{ {
if (wxTheBrushList) wxTheBrushList->AddBrush( this );
} }
wxBrush::wxBrush( const wxColour &colour, int style ) wxBrush::wxBrush( const wxColour &colour, int style )
@@ -58,41 +57,35 @@ wxBrush::wxBrush( const wxColour &colour, int style )
m_refData = new wxBrushRefData(); m_refData = new wxBrushRefData();
M_BRUSHDATA->m_style = style; M_BRUSHDATA->m_style = style;
M_BRUSHDATA->m_colour = colour; M_BRUSHDATA->m_colour = colour;
if (wxTheBrushList) wxTheBrushList->AddBrush( this );
} }
wxBrush::wxBrush( const wxBitmap &stippleBitmap ) wxBrush::wxBrush( const wxBitmap &stippleBitmap )
{ {
m_refData = new wxBrushRefData(); m_refData = new wxBrushRefData();
M_BRUSHDATA->m_colour = *wxBLACK; M_BRUSHDATA->m_colour = *wxBLACK;
M_BRUSHDATA->m_stipple = stippleBitmap; M_BRUSHDATA->m_stipple = stippleBitmap;
if (M_BRUSHDATA->m_stipple.GetMask()) if (M_BRUSHDATA->m_stipple.GetMask())
M_BRUSHDATA->m_style = wxSTIPPLE_MASK_OPAQUE; M_BRUSHDATA->m_style = wxSTIPPLE_MASK_OPAQUE;
else else
M_BRUSHDATA->m_style = wxSTIPPLE; M_BRUSHDATA->m_style = wxSTIPPLE;
if (wxTheBrushList) wxTheBrushList->AddBrush( this );
} }
wxBrush::wxBrush( const wxBrush &brush ) wxBrush::wxBrush( const wxBrush &brush )
{ {
Ref( brush ); Ref( brush );
if (wxTheBrushList) wxTheBrushList->AddBrush( this );
} }
wxBrush::~wxBrush() wxBrush::~wxBrush()
{ {
if (wxTheBrushList) wxTheBrushList->RemoveBrush( this );
} }
wxBrush& wxBrush::operator = ( const wxBrush& brush ) wxBrush& wxBrush::operator = ( const wxBrush& brush )
{ {
if (*this == brush) return (*this); if ( m_refData != brush.m_refData )
Ref( brush ); Ref( brush );
return *this; return *this;
} }
@@ -168,12 +161,12 @@ void wxBrush::SetStipple( const wxBitmap& stipple )
M_BRUSHDATA->m_stipple = stipple; M_BRUSHDATA->m_stipple = stipple;
if (M_BRUSHDATA->m_stipple.GetMask()) if (M_BRUSHDATA->m_stipple.GetMask())
{ {
M_BRUSHDATA->m_style = wxSTIPPLE_MASK_OPAQUE; M_BRUSHDATA->m_style = wxSTIPPLE_MASK_OPAQUE;
} }
else else
{ {
M_BRUSHDATA->m_style = wxSTIPPLE; M_BRUSHDATA->m_style = wxSTIPPLE;
} }
} }
void wxBrush::Unshare() void wxBrush::Unshare()

10
src/gtk1/font.cpp
View File

@@ -162,18 +162,18 @@ bool wxNativeFontInfo::FromString(const wxString& s)
xFontName = tokenizer.GetNextToken(); xFontName = tokenizer.GetNextToken();
if(!xFontName) if(!xFontName)
return FALSE; return FALSE;
return TRUE; return TRUE;
} }
wxString wxNativeFontInfo::ToString() const wxString wxNativeFontInfo::ToString() const
{ {
wxString s; wxString s;
s.Printf(_T("%d;%s"), s.Printf(_T("%d;%s"),
0, // version 0, // version
xFontName.c_str()); xFontName.c_str());
return s; return s;
} }
@@ -185,8 +185,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
void wxFont::Init() void wxFont::Init()
{ {
if (wxTheFontList)
wxTheFontList->Append( this );
} }
wxFont::wxFont(const wxNativeFontInfo& info) wxFont::wxFont(const wxNativeFontInfo& info)
@@ -334,8 +332,6 @@ void wxFont::Unshare()
wxFont::~wxFont() wxFont::~wxFont()
{ {
if (wxTheFontList)
wxTheFontList->DeleteObject( this );
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

28
src/gtk1/pen.cpp
View File

@@ -56,7 +56,7 @@ wxPenRefData::wxPenRefData( const wxPenRefData& data )
m_countDashes = data.m_countDashes; m_countDashes = data.m_countDashes;
/* /*
if (data.m_dash) TODO if (data.m_dash) TODO
m_dash = new m_dash = new
*/ */
m_dash = data.m_dash; m_dash = data.m_dash;
} }
@@ -69,7 +69,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxPen,wxGDIObject)
wxPen::wxPen() wxPen::wxPen()
{ {
if (wxThePenList) wxThePenList->AddPen( this );
} }
wxPen::wxPen( const wxColour &colour, int width, int style ) wxPen::wxPen( const wxColour &colour, int width, int style )
@@ -78,25 +77,22 @@ wxPen::wxPen( const wxColour &colour, int width, int style )
M_PENDATA->m_width = width; M_PENDATA->m_width = width;
M_PENDATA->m_style = style; M_PENDATA->m_style = style;
M_PENDATA->m_colour = colour; M_PENDATA->m_colour = colour;
if (wxThePenList) wxThePenList->AddPen( this );
} }
wxPen::wxPen( const wxPen& pen ) wxPen::wxPen( const wxPen& pen )
{ {
Ref( pen ); Ref( pen );
if (wxThePenList) wxThePenList->AddPen( this );
} }
wxPen::~wxPen() wxPen::~wxPen()
{ {
if (wxThePenList) wxThePenList->RemovePen( this );
} }
wxPen& wxPen::operator = ( const wxPen& pen ) wxPen& wxPen::operator = ( const wxPen& pen )
{ {
if (*this == pen) return (*this); if ( m_refData != pen.m_refData )
Ref( pen ); Ref( pen );
return *this; return *this;
} }
@@ -153,20 +149,20 @@ void wxPen::SetWidth( int width )
M_PENDATA->m_width = width; M_PENDATA->m_width = width;
} }
int wxPen::GetDashes( wxDash **ptr ) const int wxPen::GetDashes( wxDash **ptr ) const
{ {
*ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*) NULL); *ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*) NULL);
return (M_PENDATA ? M_PENDATA->m_countDashes : 0); return (M_PENDATA ? M_PENDATA->m_countDashes : 0);
} }
int wxPen::GetDashCount() const int wxPen::GetDashCount() const
{ {
return (M_PENDATA->m_countDashes); return (M_PENDATA->m_countDashes);
} }
wxDash* wxPen::GetDash() const wxDash* wxPen::GetDash() const
{ {
return (wxDash*)M_PENDATA->m_dash; return (wxDash*)M_PENDATA->m_dash;
} }
int wxPen::GetCap() const int wxPen::GetCap() const

12
src/motif/app.cpp
View File

@@ -143,17 +143,7 @@ void wxApp::CleanUp()
// Destroy all GDI lists, etc. // Destroy all GDI lists, etc.
delete wxTheBrushList; wxDeleteStockLists();
wxTheBrushList = NULL;
delete wxThePenList;
wxThePenList = NULL;
delete wxTheFontList;
wxTheFontList = NULL;
delete wxTheBitmapList;
wxTheBitmapList = NULL;
delete wxTheColourDatabase; delete wxTheColourDatabase;
wxTheColourDatabase = NULL; wxTheColourDatabase = NULL;

19
src/motif/bitmap.cpp
View File

@@ -120,15 +120,10 @@ wxList wxBitmap::sm_handlers;
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 width, int height, int depth) wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)
@@ -136,33 +131,21 @@ wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)
m_refData = new wxBitmapRefData; m_refData = new wxBitmapRefData;
(void) Create((void*) bits, wxBITMAP_TYPE_XBM_DATA, width, height, depth); (void) Create((void*) bits, wxBITMAP_TYPE_XBM_DATA, width, height, depth);
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, long type, int width, int height, int depth) wxBitmap::wxBitmap(void *data, long 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, long type) wxBitmap::wxBitmap(const wxString& filename, long type)
{ {
LoadFile(filename, (int)type); LoadFile(filename, (int)type);
if ( wxTheBitmapList )
wxTheBitmapList->AddBitmap(this);
} }
// Create from XPM data // Create from XPM data
@@ -1256,8 +1239,6 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
wxCHECK_MSG( depth == -1, FALSE, wxT("invalid bitmap depth") ) wxCHECK_MSG( depth == -1, FALSE, wxT("invalid bitmap depth") )
m_refData = new wxBitmapRefData(); m_refData = new wxBitmapRefData();
if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
int width = image.GetWidth(); int width = image.GetWidth();
int height = image.GetHeight(); int height = image.GetHeight();

38
src/motif/brush.cpp
View File

@@ -1,12 +1,12 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: brush.cpp // Name: src/motif/brush.cpp
// Purpose: wxBrush // Purpose: wxBrush
// Author: Julian Smart // Author: Julian Smart
// Modified by: // Modified by:
// Created: 17/09/98 // Created: 17/09/98
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) Julian Smart // Copyright: (c) Julian Smart
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__ #ifdef __GNUG__
@@ -38,40 +38,30 @@ wxBrushRefData::~wxBrushRefData()
// Brushes // Brushes
wxBrush::wxBrush() wxBrush::wxBrush()
{ {
if ( wxTheBrushList )
wxTheBrushList->AddBrush(this);
} }
wxBrush::~wxBrush() wxBrush::~wxBrush()
{ {
if ( wxTheBrushList )
wxTheBrushList->RemoveBrush(this);
} }
wxBrush::wxBrush(const wxColour& col, int Style) wxBrush::wxBrush(const wxColour& col, int Style)
{ {
m_refData = new wxBrushRefData; m_refData = new wxBrushRefData;
M_BRUSHDATA->m_colour = col; M_BRUSHDATA->m_colour = col;
M_BRUSHDATA->m_style = Style; M_BRUSHDATA->m_style = Style;
RealizeResource(); RealizeResource();
if ( wxTheBrushList )
wxTheBrushList->AddBrush(this);
} }
wxBrush::wxBrush(const wxBitmap& stipple) wxBrush::wxBrush(const wxBitmap& stipple)
{ {
m_refData = new wxBrushRefData; m_refData = new wxBrushRefData;
M_BRUSHDATA->m_style = wxSTIPPLE; M_BRUSHDATA->m_style = wxSTIPPLE;
M_BRUSHDATA->m_stipple = stipple; M_BRUSHDATA->m_stipple = stipple;
RealizeResource(); RealizeResource();
if ( wxTheBrushList )
wxTheBrushList->AddBrush(this);
} }
void wxBrush::Unshare() void wxBrush::Unshare()
@@ -92,36 +82,36 @@ void wxBrush::Unshare()
void wxBrush::SetColour(const wxColour& col) void wxBrush::SetColour(const wxColour& col)
{ {
Unshare(); Unshare();
M_BRUSHDATA->m_colour = col; M_BRUSHDATA->m_colour = col;
RealizeResource(); RealizeResource();
} }
void wxBrush::SetColour(unsigned char r, unsigned char g, unsigned char b) void wxBrush::SetColour(unsigned char r, unsigned char g, unsigned char b)
{ {
Unshare(); Unshare();
M_BRUSHDATA->m_colour.Set(r, g, b); M_BRUSHDATA->m_colour.Set(r, g, b);
RealizeResource(); RealizeResource();
} }
void wxBrush::SetStyle(int Style) void wxBrush::SetStyle(int Style)
{ {
Unshare(); Unshare();
M_BRUSHDATA->m_style = Style; M_BRUSHDATA->m_style = Style;
RealizeResource(); RealizeResource();
} }
void wxBrush::SetStipple(const wxBitmap& Stipple) void wxBrush::SetStipple(const wxBitmap& Stipple)
{ {
Unshare(); Unshare();
M_BRUSHDATA->m_stipple = Stipple; M_BRUSHDATA->m_stipple = Stipple;
RealizeResource(); RealizeResource();
} }

7
src/motif/font.cpp
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: font.cpp // Name: src/motif/font.cpp
// Purpose: wxFont class // Purpose: wxFont class
// Author: Julian Smart // Author: Julian Smart
// Modified by: // Modified by:
@@ -196,8 +196,6 @@ wxFont::wxFont(const wxNativeFontInfo& info)
void wxFont::Init() void wxFont::Init()
{ {
if ( wxTheFontList )
wxTheFontList->Append(this);
} }
bool wxFont::Create(int pointSize, bool wxFont::Create(int pointSize,
@@ -219,8 +217,6 @@ bool wxFont::Create(int pointSize,
wxFont::~wxFont() wxFont::~wxFont()
{ {
if ( wxTheFontList )
wxTheFontList->DeleteObject(this);
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -412,3 +408,4 @@ WXFontList wxFont::GetFontList(double scale, WXDisplay* display) const
return (f ? f->m_fontList : (WXFontList) 0); return (f ? f->m_fontList : (WXFontList) 0);
} }

54
src/motif/pen.cpp
View File

@@ -1,12 +1,12 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: pen.cpp // Name: src/motif/pen.cpp
// Purpose: wxPen // Purpose: wxPen
// Author: Julian Smart // Author: Julian Smart
// Modified by: // Modified by:
// Created: 17/09/98 // Created: 17/09/98
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) Julian Smart // Copyright: (c) Julian Smart
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__ #ifdef __GNUG__
@@ -48,21 +48,17 @@ wxPenRefData::~wxPenRefData()
wxPen::wxPen() wxPen::wxPen()
{ {
if ( wxThePenList )
wxThePenList->AddPen(this);
} }
wxPen::~wxPen() wxPen::~wxPen()
{ {
if (wxThePenList)
wxThePenList->RemovePen(this);
} }
// Should implement Create // Should implement Create
wxPen::wxPen(const wxColour& col, int Width, int Style) wxPen::wxPen(const wxColour& col, int Width, int Style)
{ {
m_refData = new wxPenRefData; m_refData = new wxPenRefData;
M_PENDATA->m_colour = col; M_PENDATA->m_colour = col;
M_PENDATA->m_width = Width; M_PENDATA->m_width = Width;
M_PENDATA->m_style = Style; M_PENDATA->m_style = Style;
@@ -70,17 +66,14 @@ wxPen::wxPen(const wxColour& col, int Width, int Style)
M_PENDATA->m_cap = wxCAP_ROUND ; M_PENDATA->m_cap = wxCAP_ROUND ;
M_PENDATA->m_nbDash = 0 ; M_PENDATA->m_nbDash = 0 ;
M_PENDATA->m_dash = (wxMOTIFDash*)NULL; M_PENDATA->m_dash = (wxMOTIFDash*)NULL;
RealizeResource(); RealizeResource();
if (wxThePenList)
wxThePenList->AddPen(this);
} }
wxPen::wxPen(const wxBitmap& stipple, int Width) wxPen::wxPen(const wxBitmap& stipple, int Width)
{ {
m_refData = new wxPenRefData; m_refData = new wxPenRefData;
M_PENDATA->m_stipple = stipple; M_PENDATA->m_stipple = stipple;
M_PENDATA->m_width = Width; M_PENDATA->m_width = Width;
M_PENDATA->m_style = wxSTIPPLE; M_PENDATA->m_style = wxSTIPPLE;
@@ -88,11 +81,8 @@ wxPen::wxPen(const wxBitmap& stipple, int Width)
M_PENDATA->m_cap = wxCAP_ROUND ; M_PENDATA->m_cap = wxCAP_ROUND ;
M_PENDATA->m_nbDash = 0 ; M_PENDATA->m_nbDash = 0 ;
M_PENDATA->m_dash = (wxMOTIFDash*)NULL; M_PENDATA->m_dash = (wxMOTIFDash*)NULL;
RealizeResource(); RealizeResource();
if ( wxThePenList )
wxThePenList->AddPen(this);
} }
void wxPen::Unshare() void wxPen::Unshare()
@@ -113,74 +103,74 @@ void wxPen::Unshare()
void wxPen::SetColour(const wxColour& col) void wxPen::SetColour(const wxColour& col)
{ {
Unshare(); Unshare();
M_PENDATA->m_colour = col; M_PENDATA->m_colour = col;
RealizeResource(); RealizeResource();
} }
void wxPen::SetColour(unsigned char r, unsigned char g, unsigned char b) void wxPen::SetColour(unsigned char r, unsigned char g, unsigned char b)
{ {
Unshare(); Unshare();
M_PENDATA->m_colour.Set(r, g, b); M_PENDATA->m_colour.Set(r, g, b);
RealizeResource(); RealizeResource();
} }
void wxPen::SetWidth(int Width) void wxPen::SetWidth(int Width)
{ {
Unshare(); Unshare();
M_PENDATA->m_width = Width; M_PENDATA->m_width = Width;
RealizeResource(); RealizeResource();
} }
void wxPen::SetStyle(int Style) void wxPen::SetStyle(int Style)
{ {
Unshare(); Unshare();
M_PENDATA->m_style = Style; M_PENDATA->m_style = Style;
RealizeResource(); RealizeResource();
} }
void wxPen::SetStipple(const wxBitmap& Stipple) void wxPen::SetStipple(const wxBitmap& Stipple)
{ {
Unshare(); Unshare();
M_PENDATA->m_stipple = Stipple; M_PENDATA->m_stipple = Stipple;
M_PENDATA->m_style = wxSTIPPLE; M_PENDATA->m_style = wxSTIPPLE;
RealizeResource(); RealizeResource();
} }
void wxPen::SetDashes(int nb_dashes, const wxDash *Dash) void wxPen::SetDashes(int nb_dashes, const wxDash *Dash)
{ {
Unshare(); Unshare();
M_PENDATA->m_nbDash = nb_dashes; M_PENDATA->m_nbDash = nb_dashes;
M_PENDATA->m_dash = (wxMOTIFDash *)Dash; M_PENDATA->m_dash = (wxMOTIFDash *)Dash;
RealizeResource(); RealizeResource();
} }
void wxPen::SetJoin(int Join) void wxPen::SetJoin(int Join)
{ {
Unshare(); Unshare();
M_PENDATA->m_join = Join; M_PENDATA->m_join = Join;
RealizeResource(); RealizeResource();
} }
void wxPen::SetCap(int Cap) void wxPen::SetCap(int Cap)
{ {
Unshare(); Unshare();
M_PENDATA->m_cap = Cap; M_PENDATA->m_cap = Cap;
RealizeResource(); RealizeResource();
} }

6
src/msw/bitmap.cpp
View File

@@ -107,8 +107,6 @@ void wxBitmap::Init()
{ {
// m_refData = NULL; done in the base class ctor // m_refData = NULL; done in the base class ctor
if ( wxTheBitmapList )
wxTheBitmapList->AddBitmap(this);
} }
#ifdef __WIN32__ #ifdef __WIN32__
@@ -222,8 +220,6 @@ bool wxBitmap::CopyFromIcon(const wxIcon& icon)
wxBitmap::~wxBitmap() wxBitmap::~wxBitmap()
{ {
if (wxTheBitmapList)
wxTheBitmapList->DeleteObject(this);
} }
wxBitmap::wxBitmap(const char bits[], int width, int height, int depth) wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)
@@ -616,8 +612,6 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
GetBitmapData()->SetOk(); GetBitmapData()->SetOk();
#endif // WXWIN_COMPATIBILITY_2 #endif // WXWIN_COMPATIBILITY_2
if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
return TRUE; return TRUE;
#endif #endif
} }

8
src/msw/brush.cpp
View File

@@ -58,14 +58,10 @@ wxBrushRefData::~wxBrushRefData(void)
// Brushes // Brushes
wxBrush::wxBrush(void) wxBrush::wxBrush(void)
{ {
if ( wxTheBrushList )
wxTheBrushList->AddBrush(this);
} }
wxBrush::~wxBrush() wxBrush::~wxBrush()
{ {
if (wxTheBrushList)
wxTheBrushList->RemoveBrush(this);
} }
wxBrush::wxBrush(const wxColour& col, int Style) wxBrush::wxBrush(const wxColour& col, int Style)
@@ -78,8 +74,6 @@ wxBrush::wxBrush(const wxColour& col, int Style)
RealizeResource(); RealizeResource();
if ( wxTheBrushList )
wxTheBrushList->AddBrush(this);
} }
wxBrush::wxBrush(const wxBitmap& stipple) wxBrush::wxBrush(const wxBitmap& stipple)
@@ -96,8 +90,6 @@ wxBrush::wxBrush(const wxBitmap& stipple)
RealizeResource(); RealizeResource();
if ( wxTheBrushList )
wxTheBrushList->AddBrush(this);
} }
bool wxBrush::RealizeResource(void) bool wxBrush::RealizeResource(void)

4
src/msw/font.cpp
View File

@@ -370,8 +370,6 @@ wxString wxNativeFontInfo::ToString() const
void wxFont::Init() void wxFont::Init()
{ {
if ( wxTheFontList )
wxTheFontList->Append(this);
} }
bool wxFont::Create(const wxNativeFontInfo& info, WXHFONT hFont) bool wxFont::Create(const wxNativeFontInfo& info, WXHFONT hFont)
@@ -420,8 +418,6 @@ bool wxFont::Create(int pointSize,
wxFont::~wxFont() wxFont::~wxFont()
{ {
if ( wxTheFontList )
wxTheFontList->DeleteObject(this);
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

8
src/msw/pen.cpp
View File

@@ -67,14 +67,10 @@ wxPenRefData::~wxPenRefData()
wxPen::wxPen() wxPen::wxPen()
{ {
if (wxThePenList)
wxThePenList->AddPen(this);
} }
wxPen::~wxPen() wxPen::~wxPen()
{ {
if (wxThePenList)
wxThePenList->RemovePen(this);
} }
// Should implement Create // Should implement Create
@@ -117,8 +113,6 @@ wxPen::wxPen(const wxColour& col, int Width, int Style)
#endif #endif
RealizeResource(); RealizeResource();
if ( wxThePenList )
wxThePenList->AddPen(this);
} }
wxPen::wxPen(const wxBitmap& stipple, int Width) wxPen::wxPen(const wxBitmap& stipple, int Width)
@@ -137,8 +131,6 @@ wxPen::wxPen(const wxBitmap& stipple, int Width)
RealizeResource(); RealizeResource();
if (wxThePenList)
wxThePenList->AddPen(this);
} }
bool wxPen::RealizeResource() bool wxPen::RealizeResource()