X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..dc497201eb08e3de1402480e2ab97a6405335ecb:/src/common/gdicmn.cpp?ds=sidebyside diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp index 9b17e4400b..f2f3c71420 100644 --- a/src/common/gdicmn.cpp +++ b/src/common/gdicmn.cpp @@ -5,14 +5,10 @@ // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem +// Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "gdicmn.h" -#endif - #ifdef __VMS #define XtDisplay XTDISPLAY #endif @@ -37,12 +33,13 @@ #include "wx/dc.h" #include "wx/utils.h" #include "wx/settings.h" +#include "wx/hashmap.h" #include "wx/log.h" #include -#ifdef __WXMSW__ -#include +#if defined(__WXMSW__) +#include "wx/msw/wrapwin.h" #endif #ifdef __WXMOTIF__ @@ -55,56 +52,78 @@ #endif #endif -IMPLEMENT_CLASS(wxColourDatabase, wxList) -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) +#ifdef __WXX11__ +#include "X11/Xlib.h" +#endif + +#ifdef __WXMAC__ +#include "wx/mac/private.h" +#include "wx/mac/uma.h" +#endif -IMPLEMENT_ABSTRACT_CLASS(wxDCBase, wxObject) +#if wxUSE_EXTENDED_RTTI -wxRect::wxRect(const wxPoint& topLeft, const wxPoint& bottomRight) +// wxPoint + +template<> void wxStringReadValue(const wxString &s , wxPoint &data ) { - x = topLeft.x; - y = topLeft.y; - width = bottomRight.x - topLeft.x + 1; - height = bottomRight.y - topLeft.y + 1; + wxSscanf(s, wxT("%d,%d"), &data.x , &data.y ) ; +} - if (width < 0) - { - width = -width; - x -= width; - } +template<> void wxStringWriteValue(wxString &s , const wxPoint &data ) +{ + s = wxString::Format(wxT("%d,%d"), data.x , data.y ) ; +} - if (height < 0) - { - height = -height; - y -= height; - } +wxCUSTOM_TYPE_INFO(wxPoint, wxToStringConverter , wxFromStringConverter) + +template<> void wxStringReadValue(const wxString &s , wxSize &data ) +{ + wxSscanf(s, wxT("%d,%d"), &data.x , &data.y ) ; } -wxRect::wxRect(const wxPoint& point, const wxSize& size) +template<> void wxStringWriteValue(wxString &s , const wxSize &data ) { - x = point.x; y = point.y; - width = size.x; height = size.y; + s = wxString::Format(wxT("%d,%d"), data.x , data.y ) ; } -bool wxRect::operator==(const wxRect& rect) const +wxCUSTOM_TYPE_INFO(wxSize, wxToStringConverter , wxFromStringConverter) + +#endif + +IMPLEMENT_ABSTRACT_CLASS(wxDCBase, wxObject) + +wxRect::wxRect(const wxPoint& point1, const wxPoint& point2) { - return ((x == rect.x) && - (y == rect.y) && - (width == rect.width) && - (height == rect.height)); + x = point1.x; + y = point1.y; + width = point2.x - point1.x; + height = point2.y - point1.y; + + if (width < 0) + { + width = -width; + x = point2.x; + } + width++; + + if (height < 0) + { + height = -height; + y = point2.y; + } + height++; } -wxRect& wxRect::operator += (const wxRect& rect) +bool wxRect::operator==(const wxRect& rect) const { - *this = (*this + rect); - return ( *this ) ; + return ((x == rect.x) && + (y == rect.y) && + (width == rect.width) && + (height == rect.height)); } -wxRect wxRect::operator + (const wxRect& rect) const +wxRect wxRect::operator+(const wxRect& rect) const { int x1 = wxMin(this->x, rect.x); int y1 = wxMin(this->y, rect.y); @@ -113,17 +132,60 @@ wxRect wxRect::operator + (const wxRect& rect) const return wxRect(x1, y1, x2-x1, y2-y1); } -wxRect& wxRect::Inflate(wxCoord dx, wxCoord dy) +wxRect& wxRect::Union(const wxRect& rect) { - x -= dx; - y -= dy; - width += 2*dx; - height += 2*dy; + // ignore empty rectangles: union with an empty rectangle shouldn't extend + // this one to (0, 0) + if ( !width || !height ) + { + *this = rect; + } + else if ( rect.width && rect.height ) + { + int x1 = wxMin(x, rect.x); + int y1 = wxMin(y, rect.y); + int y2 = wxMax(y + height, rect.height + rect.y); + int x2 = wxMax(x + width, rect.width + rect.x); + + x = x1; + y = y1; + width = x2 - x1; + height = y2 - y1; + } + //else: we're not empty and rect is empty + + return *this; +} - // check that we didn't make the rectangle invalid by accident (you almost - // never want to have negative coords and never want negative size) - wxASSERT_MSG( x >= 0 && y >= 0 && width >= 0 && height >= 0, - _T("wxRect::Inflate() resulted in an invalid rectangle!") ); +wxRect& wxRect::Inflate(wxCoord dx, wxCoord dy) +{ + if (-2*dx>width) + { + // Don't allow deflate to eat more width than we have, + // a well-defined rectangle cannot have negative width. + x+=width/2; + width=0; + } + else + { + // The inflate is valid. + x-=dx; + width+=2*dx; + } + + if (-2*dy>height) + { + // Don't allow deflate to eat more height than we have, + // a well-defined rectangle cannot have negative height. + y+=height/2; + height=0; + } + else + { + // The inflate is valid. + y-=dy; + height+=2*dy; + } return *this; } @@ -170,33 +232,49 @@ bool wxRect::Intersects(const wxRect& rect) const return r.width != 0; } -wxColourDatabase::wxColourDatabase (int type) : wxList (type) +// ============================================================================ +// wxColourDatabase +// ============================================================================ + +// ---------------------------------------------------------------------------- +// wxColourDatabase ctor/dtor +// ---------------------------------------------------------------------------- + +wxColourDatabase::wxColourDatabase () { + // will be created on demand in Initialize() + m_map = NULL; } wxColourDatabase::~wxColourDatabase () { - // Cleanup Colour allocated in Initialize() - wxNode *node = First (); - while (node) + if ( m_map ) { - wxColour *col = (wxColour *) node->Data (); - wxNode *next = node->Next (); - delete col; - node = next; + WX_CLEAR_HASH_MAP(wxStringToColourHashMap, *m_map); + + delete m_map; } + #ifdef __WXPM__ delete [] m_palTable; #endif } // Colour database stuff -void wxColourDatabase::Initialize () +void wxColourDatabase::Initialize() { + if ( m_map ) + { + // already initialized + return; + } + + m_map = new wxStringToColourHashMap; + static const struct wxColourDesc { const wxChar *name; - int r,g,b; + unsigned char r,g,b; } wxColourTable[] = { @@ -270,20 +348,17 @@ void wxColourDatabase::Initialize () {wxT("WHEAT"), 216, 216, 191}, {wxT("WHITE"), 255, 255, 255}, {wxT("YELLOW"), 255, 255, 0}, - {wxT("YELLOW GREEN"), 153, 204, 50}, - {wxT("MEDIUM GOLDENROD"), 234, 234, 173}, - {wxT("MEDIUM FOREST GREEN"), 107, 142, 35}, - {wxT("LIGHT MAGENTA"), 255, 0, 255}, - {wxT("MEDIUM GREY"), 100, 100, 100}, + {wxT("YELLOW GREEN"), 153, 204, 50} }; - size_t n; + size_t n; for ( n = 0; n < WXSIZEOF(wxColourTable); n++ ) { const wxColourDesc& cc = wxColourTable[n]; - Append(cc.name, new wxColour(cc.r,cc.g,cc.b)); + (*m_map)[cc.name] = new wxColour(cc.r, cc.g, cc.b); } + #ifdef __WXPM__ m_palTable = new long[n]; for ( n = 0; n < WXSIZEOF(wxColourTable); n++ ) @@ -295,126 +370,165 @@ void wxColourDatabase::Initialize () #endif } -/* - * Changed by Ian Brown, July 1994. - * - * When running under X, the Colour Database starts off empty. The X server - * is queried for the colour first time after which it is entered into the - * database. This allows our client to use the server colour database which - * is hopefully gamma corrected for the display being used. - */ - -wxColour *wxColourDatabase::FindColour(const wxString& colour) -{ - // VZ: make the comparaison case insensitive and also match both grey and - // gray - wxString colName = colour; +// ---------------------------------------------------------------------------- +// wxColourDatabase operations +// ---------------------------------------------------------------------------- + +void wxColourDatabase::AddColour(const wxString& name, const wxColour& colour) +{ + Initialize(); + + // canonicalize the colour names before using them as keys: they should be + // in upper case + wxString colName = name; colName.MakeUpper(); - wxString colName2 = colName; - if ( !colName2.Replace(_T("GRAY"), _T("GREY")) ) - colName2.clear(); - wxNode *node = First(); - while ( node ) + // ... and we also allow both grey/gray + wxString colNameAlt = colName; + if ( !colNameAlt.Replace(_T("GRAY"), _T("GREY")) ) { - const wxChar *key = node->GetKeyString(); - if ( colName == key || colName2 == key ) - { - return (wxColour *)node->Data(); - } + // but in this case it is not necessary so avoid extra search below + colNameAlt.clear(); + } - node = node->Next(); + wxStringToColourHashMap::iterator it = m_map->find(colName); + if ( it == m_map->end() && !colNameAlt.empty() ) + it = m_map->find(colNameAlt); + if ( it != m_map->end() ) + { + *(it->second) = colour; + } + else // new colour + { + (*m_map)[colName] = new wxColour(colour); } +} -#ifdef __WXMSW__ - return NULL; -#endif -#ifdef __WXPM__ - return NULL; -#endif -#ifdef __WXMGL__ - return NULL; -#endif +wxColour wxColourDatabase::Find(const wxString& colour) const +{ + wxColourDatabase * const self = wxConstCast(this, wxColourDatabase); + self->Initialize(); -// TODO for other implementations. This should really go into -// platform-specific directories. -#ifdef __WXMAC__ - return NULL; -#endif -#ifdef __WXSTUBS__ - return NULL; -#endif + // first look among the existing colours -#ifdef __WXGTK__ - wxColour *col = new wxColour( colour ); + // make the comparaison case insensitive and also match both grey and gray + wxString colName = colour; + colName.MakeUpper(); + wxString colNameAlt = colName; + if ( !colNameAlt.Replace(_T("GRAY"), _T("GREY")) ) + colNameAlt.clear(); - if (!(col->Ok())) { - delete col; - return (wxColour *) NULL; - } - Append( colour, col ); - return col; -#endif + wxStringToColourHashMap::iterator it = m_map->find(colName); + if ( it == m_map->end() && !colNameAlt.empty() ) + it = m_map->find(colNameAlt); + if ( it != m_map->end() ) + return *(it->second); -#ifdef __X__ + // if we didn't find it, query the system, maybe it knows about it +#if defined(__WXGTK__) || defined(__X__) + wxColour col = wxColour::CreateByName(colour); + + if ( col.Ok() ) + { + // cache it + self->AddColour(colour, col); + } + + return col; +#elif defined(__X__) + // TODO: move this to wxColour::CreateByName() XColor xcolour; #ifdef __WXMOTIF__ Display *display = XtDisplay((Widget) wxTheApp->GetTopLevelWidget()) ; #endif -#ifdef __XVIEW__ - Xv_Screen screen = xv_get(xview_server, SERVER_NTH_SCREEN, 0); - Xv_opaque root_window = xv_get(screen, XV_ROOT); - Display *display = (Display *)xv_get(root_window, XV_DISPLAY); +#ifdef __WXX11__ + Display* display = (Display*) wxGetDisplay(); #endif - /* MATTHEW: [4] Use wxGetMainColormap */ - if (!XParseColor(display, (Colormap) wxTheApp->GetMainColormap((WXDisplay*) display), colour,&xcolour)) - return NULL; + if (!XParseColor(display, (Colormap) wxTheApp->GetMainColormap((WXDisplay*) display), colour.ToAscii() ,&xcolour)) + return NULL; +#if wxUSE_NANOX + unsigned char r = (unsigned char)(xcolour.red); + unsigned char g = (unsigned char)(xcolour.green); + unsigned char b = (unsigned char)(xcolour.blue); +#else unsigned char r = (unsigned char)(xcolour.red >> 8); unsigned char g = (unsigned char)(xcolour.green >> 8); unsigned char b = (unsigned char)(xcolour.blue >> 8); +#endif - wxColour *col = new wxColour(r, g, b); - Append(colour, col); + wxColour col(r, g, b); + AddColour(colour, col); return col; -#endif // __X__ +#else // other platform + return wxNullColour; +#endif // platforms } -wxString wxColourDatabase::FindName (const wxColour& colour) const +wxString wxColourDatabase::FindName(const wxColour& colour) const { - wxString name; + wxColourDatabase * const self = wxConstCast(this, wxColourDatabase); + self->Initialize(); - unsigned char red = colour.Red (); - unsigned char green = colour.Green (); - unsigned char blue = colour.Blue (); + typedef wxStringToColourHashMap::iterator iterator; - for (wxNode * node = First (); node; node = node->Next ()) + for ( iterator it = m_map->begin(), en = m_map->end(); it != en; ++it ) { - wxColour *col = (wxColour *) node->Data (); + if ( *(it->second) == colour ) + return it->first; + } - if (col->Red () == red && col->Green () == green && col->Blue () == blue) - { - const wxChar *found = node->GetKeyString(); - if ( found ) - { - name = found; + return wxEmptyString; +} - break; - } - } - } +// ---------------------------------------------------------------------------- +// deprecated wxColourDatabase methods +// ---------------------------------------------------------------------------- + +wxColour *wxColourDatabase::FindColour(const wxString& name) +{ + // This function is deprecated, use Find() instead. + // Formerly this function sometimes would return a deletable pointer and + // sometimes a non-deletable one (when returning a colour from the database). + // Trying to delete the latter anyway results in problems, so probably + // nobody ever freed the pointers. Currently it always returns a new + // instance, which means there will be memory leaks. + wxLogDebug(wxT("wxColourDataBase::FindColour():") + wxT(" Please use wxColourDataBase::Find() instead")); + + // using a static variable here is not the most elegant solution but unless + // we want to make wxStringToColourHashMap public (i.e. move it to the + // header) so that we could have a member function returning + // wxStringToColourHashMap::iterator, there is really no good way to do it + // otherwise + // + // and knowing that this function is going to disappear in the next release + // anyhow I don't want to waste time on this - return name; + static wxColour s_col; + + s_col = Find(name); + if ( !s_col.Ok() ) + return NULL; + + return new wxColour(s_col); } -void wxInitializeStockLists () { - wxTheBrushList = new wxBrushList; - wxThePenList = new wxPenList; - wxTheFontList = new wxFontList; - wxTheBitmapList = new wxBitmapList; +// ============================================================================ +// stock objects +// ============================================================================ + +void wxInitializeStockLists() +{ + wxTheColourDatabase = new wxColourDatabase; + + wxTheBrushList = new wxBrushList; + wxThePenList = new wxPenList; + wxTheFontList = new wxFontList; + wxTheBitmapList = new wxBitmapList; } void wxInitializeStockObjects () @@ -433,148 +547,185 @@ void wxInitializeStockObjects () #else #endif */ -#if defined(__WXPM__) || defined(__WXMAC__) - static const int sizeFont = 12; - wxNORMAL_FONT = new wxFont (sizeFont, wxMODERN, wxNORMAL, wxNORMAL); +#if defined(__WXMAC__) + // retrieve size of system font for all stock fonts + int sizeFont = 12; + + Str255 fontName ; + SInt16 fontSize ; + Style fontStyle ; + + GetThemeFont(kThemeSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ; + sizeFont = fontSize ; +#ifdef __WXMAC_CLASSIC__ + wxNORMAL_FONT = new wxFont (fontSize, wxMODERN, wxNORMAL, wxNORMAL , false , wxMacMakeStringFromPascal(fontName) ); +#else + wxNORMAL_FONT = new wxFont () ; + wxNORMAL_FONT->MacCreateThemeFont( kThemeSystemFont ); +#endif +#elif defined(__WXPM__) + static const int sizeFont = 12; +#else + wxNORMAL_FONT = new wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); + static const int sizeFont = wxNORMAL_FONT->GetPointSize(); +#endif + +#if defined(__WXPM__) + /* + // Basic OS/2 has a fairly limited number of fonts and these are as good + // as I can do to get something that looks halfway "wx" normal + */ + wxNORMAL_FONT = new wxFont (sizeFont, wxMODERN, wxNORMAL, wxBOLD); + wxSMALL_FONT = new wxFont (sizeFont - 4, wxSWISS, wxNORMAL, wxNORMAL); /* Helv */ + wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL); + wxSWISS_FONT = new wxFont (sizeFont, wxSWISS, wxNORMAL, wxNORMAL); /* Helv */ +#elif defined(__WXMAC__) + wxSWISS_FONT = new wxFont (sizeFont, wxSWISS, wxNORMAL, wxNORMAL); /* Helv */ + wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL); +#ifdef __WXMAC_CLASSIC__ + GetThemeFont(kThemeSmallSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ; + wxSMALL_FONT = new wxFont (fontSize, wxSWISS, wxNORMAL, wxNORMAL , false , wxMacMakeStringFromPascal( fontName ) ); #else - wxNORMAL_FONT = new wxFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT)); - static const int sizeFont = wxNORMAL_FONT->GetPointSize(); + wxSMALL_FONT = new wxFont () ; + wxSMALL_FONT->MacCreateThemeFont( kThemeSmallSystemFont ); +#endif +#else + wxSMALL_FONT = new wxFont (sizeFont - 2, wxSWISS, wxNORMAL, wxNORMAL); + wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL); + wxSWISS_FONT = new wxFont (sizeFont, wxSWISS, wxNORMAL, wxNORMAL); #endif - wxSMALL_FONT = new wxFont (sizeFont - 2, wxSWISS, wxNORMAL, wxNORMAL); - wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL); - wxSWISS_FONT = new wxFont (sizeFont, wxSWISS, wxNORMAL, wxNORMAL); - - wxRED_PEN = new wxPen ("RED", 1, wxSOLID); - wxCYAN_PEN = new wxPen ("CYAN", 1, wxSOLID); - wxGREEN_PEN = new wxPen ("GREEN", 1, wxSOLID); - wxBLACK_PEN = new wxPen ("BLACK", 1, wxSOLID); - wxWHITE_PEN = new wxPen ("WHITE", 1, wxSOLID); - wxTRANSPARENT_PEN = new wxPen ("BLACK", 1, wxTRANSPARENT); - wxBLACK_DASHED_PEN = new wxPen ("BLACK", 1, wxSHORT_DASH); - wxGREY_PEN = new wxPen ("GREY", 1, wxSOLID); - wxMEDIUM_GREY_PEN = new wxPen ("MEDIUM GREY", 1, wxSOLID); - wxLIGHT_GREY_PEN = new wxPen ("LIGHT GREY", 1, wxSOLID); - - wxBLUE_BRUSH = new wxBrush ("BLUE", wxSOLID); - wxGREEN_BRUSH = new wxBrush ("GREEN", wxSOLID); - wxWHITE_BRUSH = new wxBrush ("WHITE", wxSOLID); - wxBLACK_BRUSH = new wxBrush ("BLACK", wxSOLID); - wxTRANSPARENT_BRUSH = new wxBrush ("BLACK", wxTRANSPARENT); - wxCYAN_BRUSH = new wxBrush ("CYAN", wxSOLID); - wxRED_BRUSH = new wxBrush ("RED", wxSOLID); - wxGREY_BRUSH = new wxBrush ("GREY", wxSOLID); - wxMEDIUM_GREY_BRUSH = new wxBrush ("MEDIUM GREY", wxSOLID); - wxLIGHT_GREY_BRUSH = new wxBrush ("LIGHT GREY", wxSOLID); - - wxBLACK = new wxColour ("BLACK"); - wxWHITE = new wxColour ("WHITE"); - wxRED = new wxColour ("RED"); - wxBLUE = new wxColour ("BLUE"); - wxGREEN = new wxColour ("GREEN"); - wxCYAN = new wxColour ("CYAN"); - wxLIGHT_GREY = new wxColour ("LIGHT GREY"); - - wxSTANDARD_CURSOR = new wxCursor (wxCURSOR_ARROW); - wxHOURGLASS_CURSOR = new wxCursor (wxCURSOR_WAIT); - wxCROSS_CURSOR = new wxCursor (wxCURSOR_CROSS); + wxRED_PEN = new wxPen (wxT("RED"), 1, wxSOLID); + wxCYAN_PEN = new wxPen (wxT("CYAN"), 1, wxSOLID); + wxGREEN_PEN = new wxPen (wxT("GREEN"), 1, wxSOLID); + wxBLACK_PEN = new wxPen (wxT("BLACK"), 1, wxSOLID); + wxWHITE_PEN = new wxPen (wxT("WHITE"), 1, wxSOLID); + wxTRANSPARENT_PEN = new wxPen (wxT("BLACK"), 1, wxTRANSPARENT); + wxBLACK_DASHED_PEN = new wxPen (wxT("BLACK"), 1, wxSHORT_DASH); + wxGREY_PEN = new wxPen (wxT("GREY"), 1, wxSOLID); + wxMEDIUM_GREY_PEN = new wxPen (wxT("MEDIUM GREY"), 1, wxSOLID); + wxLIGHT_GREY_PEN = new wxPen (wxT("LIGHT GREY"), 1, wxSOLID); + + wxBLUE_BRUSH = new wxBrush (wxT("BLUE"), wxSOLID); + wxGREEN_BRUSH = new wxBrush (wxT("GREEN"), wxSOLID); + wxWHITE_BRUSH = new wxBrush (wxT("WHITE"), wxSOLID); + wxBLACK_BRUSH = new wxBrush (wxT("BLACK"), wxSOLID); + wxTRANSPARENT_BRUSH = new wxBrush (wxT("BLACK"), wxTRANSPARENT); + wxCYAN_BRUSH = new wxBrush (wxT("CYAN"), wxSOLID); + wxRED_BRUSH = new wxBrush (wxT("RED"), wxSOLID); + wxGREY_BRUSH = new wxBrush (wxT("GREY"), wxSOLID); + wxMEDIUM_GREY_BRUSH = new wxBrush (wxT("MEDIUM GREY"), wxSOLID); + wxLIGHT_GREY_BRUSH = new wxBrush (wxT("LIGHT GREY"), wxSOLID); + + wxBLACK = new wxColour (wxT("BLACK")); + wxWHITE = new wxColour (wxT("WHITE")); + wxRED = new wxColour (wxT("RED")); + wxBLUE = new wxColour (wxT("BLUE")); + wxGREEN = new wxColour (wxT("GREEN")); + wxCYAN = new wxColour (wxT("CYAN")); + wxLIGHT_GREY = new wxColour (wxT("LIGHT GREY")); + + wxSTANDARD_CURSOR = new wxCursor (wxCURSOR_ARROW); + wxHOURGLASS_CURSOR = new wxCursor (wxCURSOR_WAIT); + wxCROSS_CURSOR = new wxCursor (wxCURSOR_CROSS); } void wxDeleteStockObjects () { - 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 () -{ -} + 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); +} + +// ============================================================================ +// wxTheXXXList stuff (semi-obsolete) +// ============================================================================ wxBitmapList::~wxBitmapList () { - wxNode *node = First (); - while (node) + wxList::compatibility_iterator node = GetFirst (); + while (node) { - wxBitmap *bitmap = (wxBitmap *) node->Data (); - wxNode *next = node->Next (); - if (bitmap->GetVisible()) - delete bitmap; - node = next; + wxBitmap *bitmap = (wxBitmap *) node->GetData (); + wxList::compatibility_iterator next = node->GetNext (); + if (bitmap->GetVisible()) + delete bitmap; + node = next; } } // Pen and Brush lists wxPenList::~wxPenList () { - wxNode *node = First (); - while (node) + wxList::compatibility_iterator node = GetFirst (); + while (node) { - wxPen *pen = (wxPen *) node->Data (); - wxNode *next = node->Next (); - if (pen->GetVisible()) - delete pen; - node = next; + wxPen *pen = (wxPen *) node->GetData (); + wxList::compatibility_iterator next = node->GetNext (); + if (pen->GetVisible()) + delete pen; + node = next; } } void wxPenList::AddPen (wxPen * pen) { - Append (pen); + Append (pen); } void wxPenList::RemovePen (wxPen * pen) { - DeleteObject (pen); + DeleteObject (pen); } wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, int width, int style) { - for (wxNode * node = First (); node; node = node->Next ()) + for (wxList::compatibility_iterator node = GetFirst (); node; node = node->GetNext ()) { - wxPen *each_pen = (wxPen *) node->Data (); + wxPen *each_pen = (wxPen *) node->GetData (); if (each_pen && each_pen->GetVisible() && each_pen->GetWidth () == width && @@ -594,38 +745,37 @@ wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, int width, int style) return NULL; } - // Yes, we can return a pointer to this in a later FindOrCreatePen call, - // because we created it within FindOrCreatePen. Safeguards against - // returning a pointer to an automatic variable and hanging on to it - // (dangling pointer). - pen->SetVisible(TRUE); + AddPen(pen); + + // we'll delete it ourselves later + pen->SetVisible(true); return pen; } wxBrushList::~wxBrushList () { - wxNode *node = First (); - while (node) + wxList::compatibility_iterator node = GetFirst (); + while (node) { - wxBrush *brush = (wxBrush *) node->Data (); - wxNode *next = node->Next (); - if (brush->GetVisible()) - delete brush; - node = next; + wxBrush *brush = (wxBrush *) node->GetData (); + wxList::compatibility_iterator next = node->GetNext (); + if (brush && brush->GetVisible()) + delete brush; + node = next; } } void wxBrushList::AddBrush (wxBrush * brush) { - Append (brush); + Append (brush); } wxBrush *wxBrushList::FindOrCreateBrush (const wxColour& colour, int style) { - for (wxNode * node = First (); node; node = node->Next ()) + for (wxList::compatibility_iterator node = GetFirst (); node; node = node->GetNext ()) { - wxBrush *each_brush = (wxBrush *) node->Data (); + wxBrush *each_brush = (wxBrush *) node->GetData (); if (each_brush && each_brush->GetVisible() && each_brush->GetStyle () == style && @@ -645,31 +795,30 @@ wxBrush *wxBrushList::FindOrCreateBrush (const wxColour& colour, int style) return NULL; } - brush->SetVisible(TRUE); + AddBrush(brush); + + // we'll delete it ourselves later + 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; } void wxBrushList::RemoveBrush (wxBrush * brush) { - DeleteObject (brush); + DeleteObject (brush); } wxFontList::~wxFontList () { - wxNode *node = First (); + wxList::compatibility_iterator node = GetFirst (); while (node) { // 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 (); + wxFont *font = (wxFont *) node->GetData (); + wxList::compatibility_iterator next = node->GetNext (); if (font->GetVisible()) delete font; node = next; @@ -678,12 +827,12 @@ wxFontList::~wxFontList () void wxFontList::AddFont (wxFont * font) { - Append (font); + Append (font); } void wxFontList::RemoveFont (wxFont * font) { - DeleteObject (font); + DeleteObject (font); } wxFont *wxFontList::FindOrCreateFont(int pointSize, @@ -695,10 +844,10 @@ wxFont *wxFontList::FindOrCreateFont(int pointSize, wxFontEncoding encoding) { wxFont *font = (wxFont *)NULL; - wxNode *node; - for ( node = First(); node; node = node->Next() ) + wxList::compatibility_iterator node; + for ( node = GetFirst(); node; node = node->GetNext() ) { - font = (wxFont *)node->Data(); + font = (wxFont *)node->GetData(); if ( font->GetVisible() && font->Ok() && font->GetPointSize () == pointSize && @@ -724,7 +873,7 @@ wxFont *wxFontList::FindOrCreateFont(int pointSize, // a different font if we create it with empty facename, but it is // still better than never matching anything in the cache at all // in this case - if ( same && !!facename ) + if ( same && !facename.empty() ) { const wxString& fontFace = font->GetFaceName(); @@ -751,8 +900,10 @@ wxFont *wxFontList::FindOrCreateFont(int pointSize, font = new wxFont(pointSize, family, style, weight, underline, facename, encoding); + AddFont(font); + // and mark it as being cacheable - font->SetVisible(TRUE); + font->SetVisible(true); } return font; @@ -791,12 +942,12 @@ wxSize wxGetDisplaySizeMM() wxResourceCache::~wxResourceCache () { - wxNode *node = First (); + wxList::compatibility_iterator node = GetFirst (); while (node) { - wxObject *item = (wxObject *)node->Data(); + wxObject *item = (wxObject *)node->GetData(); delete item; - node = node->Next (); + node = node->GetNext (); } }