X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/66bd6b93005b803910caca469110495ce549599f..6f34921d9369a31de14e4b07e4824e2d701710f0:/src/common/gdicmn.cpp diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp index 913b36b7b9..4bb0019e0d 100644 --- a/src/common/gdicmn.cpp +++ b/src/common/gdicmn.cpp @@ -20,6 +20,7 @@ #pragma hdrstop #endif + #include "wx/gdicmn.h" #include "wx/brush.h" #include "wx/pen.h" @@ -29,6 +30,7 @@ #include "wx/font.h" #include "wx/palette.h" +#include "wx/log.h" #include #ifdef __WXMSW__ @@ -41,6 +43,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxFontList, wxList) IMPLEMENT_DYNAMIC_CLASS(wxPenList, wxList) IMPLEMENT_DYNAMIC_CLASS(wxBrushList, wxList) IMPLEMENT_DYNAMIC_CLASS(wxBitmapList, wxList) +IMPLEMENT_DYNAMIC_CLASS(wxResourceCache, wxList) /* IMPLEMENT_DYNAMIC_CLASS(wxRect, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxPoint, wxObject) @@ -256,13 +259,19 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour) else return NULL; #endif +// TODO for other implementations. This should really go into +// platform-specific directories. +#ifdef __WXSTUBS__ + else return NULL; +#endif + #ifdef __WXGTK__ else { wxColour *col = new wxColour( colour ); if (!(col->Ok())) { delete col; - return NULL; + return (wxColour *) NULL; } Append( colour, col ); return col; @@ -319,14 +328,15 @@ wxString wxColourDatabase::FindName (const wxColour& colour) const } -void -wxInitializeStockObjects () -{ +void wxInitializeStockLists () { wxTheBrushList = new wxBrushList; wxThePenList = new wxPenList; wxTheFontList = new wxFontList; wxTheBitmapList = new wxBitmapList; +} +void wxInitializeStockObjects () +{ #ifdef __WXMOTIF__ #endif #ifdef __X__ @@ -376,44 +386,51 @@ wxInitializeStockObjects () void wxDeleteStockObjects () { - DELETEP(wxNORMAL_FONT); - DELETEP(wxSMALL_FONT); - DELETEP(wxITALIC_FONT); - DELETEP(wxSWISS_FONT); - - DELETEP(wxRED_PEN); - DELETEP(wxCYAN_PEN); - DELETEP(wxGREEN_PEN); - DELETEP(wxBLACK_PEN); - DELETEP(wxWHITE_PEN); - DELETEP(wxTRANSPARENT_PEN); - DELETEP(wxBLACK_DASHED_PEN); - DELETEP(wxGREY_PEN); - DELETEP(wxMEDIUM_GREY_PEN); - DELETEP(wxLIGHT_GREY_PEN); - - DELETEP(wxBLUE_BRUSH); - DELETEP(wxGREEN_BRUSH); - DELETEP(wxWHITE_BRUSH); - DELETEP(wxBLACK_BRUSH); - DELETEP(wxTRANSPARENT_BRUSH); - DELETEP(wxCYAN_BRUSH); - DELETEP(wxRED_BRUSH); - DELETEP(wxGREY_BRUSH); - DELETEP(wxMEDIUM_GREY_BRUSH); - DELETEP(wxLIGHT_GREY_BRUSH); - - DELETEP(wxBLACK); - DELETEP(wxWHITE); - DELETEP(wxRED); - DELETEP(wxBLUE); - DELETEP(wxGREEN); - DELETEP(wxCYAN); - DELETEP(wxLIGHT_GREY); - - DELETEP(wxSTANDARD_CURSOR); - DELETEP(wxHOURGLASS_CURSOR); - DELETEP(wxCROSS_CURSOR); + wxDELETE(wxNORMAL_FONT); + wxDELETE(wxSMALL_FONT); + wxDELETE(wxITALIC_FONT); + wxDELETE(wxSWISS_FONT); + + wxDELETE(wxRED_PEN); + wxDELETE(wxCYAN_PEN); + wxDELETE(wxGREEN_PEN); + wxDELETE(wxBLACK_PEN); + wxDELETE(wxWHITE_PEN); + wxDELETE(wxTRANSPARENT_PEN); + wxDELETE(wxBLACK_DASHED_PEN); + wxDELETE(wxGREY_PEN); + wxDELETE(wxMEDIUM_GREY_PEN); + wxDELETE(wxLIGHT_GREY_PEN); + + wxDELETE(wxBLUE_BRUSH); + wxDELETE(wxGREEN_BRUSH); + wxDELETE(wxWHITE_BRUSH); + wxDELETE(wxBLACK_BRUSH); + wxDELETE(wxTRANSPARENT_BRUSH); + wxDELETE(wxCYAN_BRUSH); + wxDELETE(wxRED_BRUSH); + wxDELETE(wxGREY_BRUSH); + wxDELETE(wxMEDIUM_GREY_BRUSH); + wxDELETE(wxLIGHT_GREY_BRUSH); + + wxDELETE(wxBLACK); + wxDELETE(wxWHITE); + wxDELETE(wxRED); + wxDELETE(wxBLUE); + wxDELETE(wxGREEN); + wxDELETE(wxCYAN); + wxDELETE(wxLIGHT_GREY); + + wxDELETE(wxSTANDARD_CURSOR); + wxDELETE(wxHOURGLASS_CURSOR); + wxDELETE(wxCROSS_CURSOR); +} + +void wxDeleteStockLists() { + wxDELETE(wxTheBrushList); + wxDELETE(wxThePenList); + wxDELETE(wxTheFontList); + wxDELETE(wxTheBitmapList); } wxBitmapList::wxBitmapList () @@ -422,29 +439,35 @@ wxBitmapList::wxBitmapList () wxBitmapList::~wxBitmapList () { + wxLogDebug("~wxBitmapList: count = %d", Number()); +#ifdef __WXMSW__ + wxNode *node = First (); while (node) { wxBitmap *bitmap = (wxBitmap *) node->Data (); wxNode *next = node->Next (); - delete bitmap; -// bitmap->FreeResource(TRUE); + if (bitmap->GetVisible()) + delete bitmap; node = next; } +#endif } // Pen and Brush lists wxPenList::~wxPenList () { +#ifdef __WXMSW__ wxNode *node = First (); while (node) { wxPen *pen = (wxPen *) node->Data (); wxNode *next = node->Next (); - delete pen; -// pen->FreeResource(TRUE); + if (pen->GetVisible()) + delete pen; node = next; } +#endif } void wxPenList::AddPen (wxPen * pen) @@ -486,19 +509,22 @@ wxPen *wxPenList::FindOrCreatePen (const wxString& colour, int width, int style) if (the_colour) return FindOrCreatePen (*the_colour, width, style); else - return NULL; + return (wxPen *) NULL; } wxBrushList::~wxBrushList () { +#ifdef __WXMSW__ wxNode *node = First (); while (node) { wxBrush *brush = (wxBrush *) node->Data (); wxNode *next = node->Next (); - delete brush; + if (brush->GetVisible()) + delete brush; node = next; } +#endif } void wxBrushList::AddBrush (wxBrush * brush) @@ -533,7 +559,7 @@ wxBrush *wxBrushList::FindOrCreateBrush (const wxString& colour, int style) if (the_colour) return FindOrCreateBrush (*the_colour, style); else - return NULL; + return (wxBrush *) NULL; } void wxBrushList::RemoveBrush (wxBrush * brush) @@ -547,21 +573,16 @@ wxFontList::~wxFontList () wxNode *node = First (); while (node) { -/* - wxFont *font = (wxFont *) node->Data (); - wxNode *next = node->Next (); - delete font; - node = next; -*/ - // New for 2.0: don't delete the font (it may be a member - // of a wxDC, for example) + // Only delete objects that are 'visible', i.e. + // that have been created using FindOrCreate..., + // where the pointers are expected to be shared + // (and therefore not deleted by any one part of an app). wxFont *font = (wxFont *) node->Data (); wxNode *next = node->Next (); - - // Force the font to be deleted - font->FreeResource(TRUE); + if (font->GetVisible()) + delete font; node = next; - } +} #endif } @@ -611,3 +632,38 @@ wxSize wxGetDisplaySize() return wxSize(x, y); } +wxResourceCache::wxResourceCache () : wxList() { +} + +wxResourceCache::wxResourceCache (const unsigned int the_key_type) : wxList(the_key_type) { +} + +wxResourceCache::~wxResourceCache () { + wxNode *node = First (); + while (node) { + wxGDIObject *item = (wxGDIObject *)node->Data(); + if (item->IsKindOf(CLASSINFO(wxBrush))) { + wxBrush *brush = (wxBrush *)item; + delete brush; + } + + if (item->IsKindOf(CLASSINFO(wxFont))) { + wxFont *font = (wxFont *)item; + delete font; + } + + if (item->IsKindOf(CLASSINFO(wxBitmap))) { + wxBitmap *bitmap = (wxBitmap *)item; + delete bitmap; + } + + if (item->IsKindOf(CLASSINFO(wxColour))) { + wxColour *colour = (wxColour *)item; + delete colour; + } + + wxNode *next = node->Next (); + node = next; + } +} +