X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5c33522fca7cddc441a316f5b9fb50d7685435ba..d8c89c487d47c0f5a9c4a3cfe2010f04d54939f5:/src/common/gdicmn.cpp diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp index e23c9a27fe..3685bb54c6 100644 --- a/src/common/gdicmn.cpp +++ b/src/common/gdicmn.cpp @@ -545,6 +545,9 @@ const wxBrush* wxStockGDI::GetBrush(Item item) case BRUSH_GREEN: brush = new wxBrush(*GetColour(COLOUR_GREEN), wxBRUSHSTYLE_SOLID); break; + case BRUSH_YELLOW: + brush = new wxBrush(*GetColour(COLOUR_YELLOW), wxBRUSHSTYLE_SOLID); + break; case BRUSH_GREY: brush = new wxBrush(wxColour(wxT("GREY")), wxBRUSHSTYLE_SOLID); break; @@ -590,6 +593,9 @@ const wxColour* wxStockGDI::GetColour(Item item) case COLOUR_GREEN: colour = new wxColour(0, 255, 0); break; + case COLOUR_YELLOW: + colour = new wxColour(255, 255, 0); + break; case COLOUR_LIGHTGREY: colour = new wxColour(wxT("LIGHT GREY")); break; @@ -671,12 +677,18 @@ const wxPen* wxStockGDI::GetPen(Item item) case PEN_BLACKDASHED: pen = new wxPen(*GetColour(COLOUR_BLACK), 1, wxPENSTYLE_SHORT_DASH); break; + case PEN_BLUE: + pen = new wxPen(*GetColour(COLOUR_BLUE), 1, wxPENSTYLE_SOLID); + break; case PEN_CYAN: pen = new wxPen(*GetColour(COLOUR_CYAN), 1, wxPENSTYLE_SOLID); break; case PEN_GREEN: pen = new wxPen(*GetColour(COLOUR_GREEN), 1, wxPENSTYLE_SOLID); break; + case PEN_YELLOW: + pen = new wxPen(*GetColour(COLOUR_YELLOW), 1, wxPENSTYLE_SOLID); + break; case PEN_GREY: pen = new wxPen(wxColour(wxT("GREY")), 1, wxPENSTYLE_SOLID); break; @@ -717,6 +729,8 @@ void wxDeleteStockLists() wxDELETE(wxTheBrushList); wxDELETE(wxThePenList); wxDELETE(wxTheFontList); + + // wxTheColourDatabase is cleaned up by wxAppBase::CleanUp() } // ============================================================================