X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ca3e85cfa8bec43f148eb1db520ab125947bf1e7..76015a6bb79156d8af1b5e8b4b8e46b4e192d18f:/src/common/gdicmn.cpp diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp index e2c0f65521..885ebec144 100644 --- a/src/common/gdicmn.cpp +++ b/src/common/gdicmn.cpp @@ -9,57 +9,59 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __VMS -#define XtDisplay XTDISPLAY -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif -#include "wx/event.h" #include "wx/gdicmn.h" -#include "wx/brush.h" -#include "wx/pen.h" -#include "wx/bitmap.h" -#include "wx/icon.h" -#include "wx/cursor.h" -#include "wx/font.h" -#include "wx/palette.h" -#include "wx/app.h" -#include "wx/dc.h" -#include "wx/utils.h" -#include "wx/settings.h" -#include "wx/hashmap.h" - -#include "wx/log.h" -#include - -#if defined(__WXMSW__) -#include "wx/msw/wrapwin.h" +#include "wx/gdiobj.h" + +#ifndef WX_PRECOMP + #include "wx/log.h" + #include "wx/pen.h" + #include "wx/brush.h" + #include "wx/palette.h" + #include "wx/icon.h" + #include "wx/iconbndl.h" + #include "wx/cursor.h" + #include "wx/settings.h" + #include "wx/bitmap.h" + #include "wx/colour.h" + #include "wx/font.h" + #include "wx/math.h" #endif -#ifdef __WXMOTIF__ -#ifdef __VMS__ -#pragma message disable nosimpint -#endif -#include -#ifdef __VMS__ -#pragma message enable nosimpint -#endif -#endif -#ifdef __WXX11__ -#include "X11/Xlib.h" -#endif +IMPLEMENT_ABSTRACT_CLASS(wxGDIObject, wxObject) -#ifdef __WXMAC__ -#include "wx/mac/private.h" -#include "wx/mac/uma.h" + +WXDLLIMPEXP_DATA_CORE(wxBrushList*) wxTheBrushList; +WXDLLIMPEXP_DATA_CORE(wxFontList*) wxTheFontList; +WXDLLIMPEXP_DATA_CORE(wxPenList*) wxThePenList; + +WXDLLIMPEXP_DATA_CORE(wxColourDatabase*) wxTheColourDatabase; + +WXDLLIMPEXP_DATA_CORE(wxBitmap) wxNullBitmap; +WXDLLIMPEXP_DATA_CORE(wxBrush) wxNullBrush; +WXDLLIMPEXP_DATA_CORE(wxColour) wxNullColour; +WXDLLIMPEXP_DATA_CORE(wxCursor) wxNullCursor; +WXDLLIMPEXP_DATA_CORE(wxFont) wxNullFont; +WXDLLIMPEXP_DATA_CORE(wxIcon) wxNullIcon; +WXDLLIMPEXP_DATA_CORE(wxPen) wxNullPen; +#if wxUSE_PALETTE +WXDLLIMPEXP_DATA_CORE(wxPalette) wxNullPalette; #endif +WXDLLIMPEXP_DATA_CORE(wxIconBundle) wxNullIconBundle; + +const wxSize wxDefaultSize(wxDefaultCoord, wxDefaultCoord); +const wxPoint wxDefaultPosition(wxDefaultCoord, wxDefaultCoord); + +#include "wx/listimpl.cpp" +WX_DEFINE_LIST(wxPointList) + #if wxUSE_EXTENDED_RTTI @@ -91,8 +93,6 @@ wxCUSTOM_TYPE_INFO(wxSize, wxToStringConverter , wxFromStringConverterx, rect.x); - int y1 = wxMin(this->y, rect.y); - int y2 = wxMax(y+height, rect.height+rect.y); - int x2 = wxMax(x+width, rect.width+rect.x); - return wxRect(x1, y1, x2-x1, y2-y1); -} - wxRect& wxRect::Union(const wxRect& rect) { // ignore empty rectangles: union with an empty rectangle shouldn't extend @@ -190,7 +173,7 @@ wxRect& wxRect::Inflate(wxCoord dx, wxCoord dy) return *this; } -bool wxRect::Inside(int cx, int cy) const +bool wxRect::Contains(int cx, int cy) const { return ( (cx >= x) && (cy >= y) && ((cy - y) < height) @@ -198,6 +181,11 @@ bool wxRect::Inside(int cx, int cy) const ); } +bool wxRect::Contains(const wxRect& rect) const +{ + return Contains(rect.GetTopLeft()) && Contains(rect.GetBottomRight()); +} + wxRect& wxRect::Intersect(const wxRect& rect) { int x2 = GetRight(), @@ -232,6 +220,43 @@ bool wxRect::Intersects(const wxRect& rect) const return r.width != 0; } +wxRect& wxRect::operator+=(const wxRect& rect) +{ + *this = *this + rect; + return *this; +} + + +wxRect& wxRect::operator*=(const wxRect& rect) +{ + *this = *this * rect; + return *this; +} + + +wxRect operator+(const wxRect& r1, const wxRect& r2) +{ + int x1 = wxMin(r1.x, r2.x); + int y1 = wxMin(r1.y, r2.y); + int y2 = wxMax(r1.y+r1.height, r2.height+r2.y); + int x2 = wxMax(r1.x+r1.width, r2.width+r2.x); + return wxRect(x1, y1, x2-x1, y2-y1); +} + +wxRect operator*(const wxRect& r1, const wxRect& r2) +{ + int x1 = wxMax(r1.x, r2.x); + int y1 = wxMax(r1.y, r2.y); + int y2 = wxMin(r1.y+r1.height, r2.height+r2.y); + int x2 = wxMin(r1.x+r1.width, r2.width+r2.x); + return wxRect(x1, y1, x2-x1, y2-y1); +} + +wxRealPoint::wxRealPoint(const wxPoint& pt) + : x(pt.x), y(pt.y) +{ +} + // ============================================================================ // wxColourDatabase // ============================================================================ @@ -329,7 +354,7 @@ void wxColourDatabase::Initialize() {wxT("ORANGE RED"), 255, 0, 127}, {wxT("ORCHID"), 219, 112, 219}, {wxT("PALE GREEN"), 143, 188, 143}, - {wxT("PINK"), 188, 143, 234}, + {wxT("PINK"), 255, 192, 203}, {wxT("PLUM"), 234, 173, 234}, {wxT("PURPLE"), 176, 0, 255}, {wxT("RED"), 255, 0, 0}, @@ -385,7 +410,7 @@ void wxColourDatabase::AddColour(const wxString& name, const wxColour& colour) // ... and we also allow both grey/gray wxString colNameAlt = colName; - if ( !colNameAlt.Replace(_T("GRAY"), _T("GREY")) ) + if ( !colNameAlt.Replace(wxT("GRAY"), wxT("GREY")) ) { // but in this case it is not necessary so avoid extra search below colNameAlt.clear(); @@ -409,13 +434,11 @@ wxColour wxColourDatabase::Find(const wxString& colour) const wxColourDatabase * const self = wxConstCast(this, wxColourDatabase); self->Initialize(); - // first look among the existing colours - // 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")) ) + if ( !colNameAlt.Replace(wxT("GRAY"), wxT("GREY")) ) colNameAlt.clear(); wxStringToColourHashMap::iterator it = m_map->find(colName); @@ -424,48 +447,12 @@ wxColour wxColourDatabase::Find(const wxString& colour) const if ( it != m_map->end() ) return *(it->second); - // 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 __WXX11__ - Display* display = (Display*) wxGetDisplay(); -#endif - /* MATTHEW: [4] Use wxGetMainColormap */ - 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(r, g, b); - AddColour(colour, col); - - return col; -#else // other platform + // we did not find any result in existing colours: + // we won't use wxString -> wxColour conversion because the + // wxColour::Set(const wxString &) function which does that conversion + // internally uses this function (wxColourDatabase::Find) and we want + // to avoid infinite recursion ! return wxNullColour; -#endif // platforms } wxString wxColourDatabase::FindName(const wxColour& colour) const @@ -512,7 +499,7 @@ wxColour *wxColourDatabase::FindColour(const wxString& name) static wxColour s_col; s_col = Find(name); - if ( !s_col.Ok() ) + if ( !s_col.IsOk() ) return NULL; return new wxColour(s_col); @@ -523,348 +510,334 @@ wxColour *wxColourDatabase::FindColour(const wxString& name) // stock objects // ============================================================================ -void wxInitializeStockLists() -{ - wxTheColourDatabase = new wxColourDatabase; +static wxStockGDI gs_wxStockGDI_instance; +wxStockGDI* wxStockGDI::ms_instance = &gs_wxStockGDI_instance; +wxObject* wxStockGDI::ms_stockObject[ITEMCOUNT]; - wxTheBrushList = new wxBrushList; - wxThePenList = new wxPenList; - wxTheFontList = new wxFontList; - wxTheBitmapList = new wxBitmapList; -} - -void wxInitializeStockObjects () +wxStockGDI::wxStockGDI() { -#ifdef __WXMOTIF__ -#endif -#ifdef __X__ - // TODO - // wxFontPool = new XFontPool; -#endif - - // why under MSW fonts shouldn't have the standard system size? -/* -#ifdef __WXMSW__ - static const int sizeFont = 10; -#else -#endif -*/ -#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 - 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 - - 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() +wxStockGDI::~wxStockGDI() { - wxDELETE(wxTheBrushList); - wxDELETE(wxThePenList); - wxDELETE(wxTheFontList); - wxDELETE(wxTheBitmapList); } -// ============================================================================ -// wxTheXXXList stuff (semi-obsolete) -// ============================================================================ - -wxBitmapList::~wxBitmapList () +void wxStockGDI::DeleteAll() { - wxList::compatibility_iterator node = GetFirst (); - while (node) + for (unsigned i = 0; i < ITEMCOUNT; i++) { - wxBitmap *bitmap = (wxBitmap *) node->GetData (); - wxList::compatibility_iterator next = node->GetNext (); - if (bitmap->GetVisible()) - delete bitmap; - node = next; + wxDELETE(ms_stockObject[i]); } } -// Pen and Brush lists -wxPenList::~wxPenList () +const wxBrush* wxStockGDI::GetBrush(Item item) { - wxList::compatibility_iterator node = GetFirst (); - while (node) + wxBrush* brush = static_cast(ms_stockObject[item]); + if (brush == NULL) { - wxPen *pen = (wxPen *) node->GetData (); - wxList::compatibility_iterator next = node->GetNext (); - if (pen->GetVisible()) - delete pen; - node = next; + switch (item) + { + case BRUSH_BLACK: + brush = new wxBrush(*GetColour(COLOUR_BLACK), wxBRUSHSTYLE_SOLID); + break; + case BRUSH_BLUE: + brush = new wxBrush(*GetColour(COLOUR_BLUE), wxBRUSHSTYLE_SOLID); + break; + case BRUSH_CYAN: + brush = new wxBrush(*GetColour(COLOUR_CYAN), wxBRUSHSTYLE_SOLID); + break; + 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; + case BRUSH_LIGHTGREY: + brush = new wxBrush(*GetColour(COLOUR_LIGHTGREY), wxBRUSHSTYLE_SOLID); + break; + case BRUSH_MEDIUMGREY: + brush = new wxBrush(wxColour(wxT("MEDIUM GREY")), wxBRUSHSTYLE_SOLID); + break; + case BRUSH_RED: + brush = new wxBrush(*GetColour(COLOUR_RED), wxBRUSHSTYLE_SOLID); + break; + case BRUSH_TRANSPARENT: + brush = new wxBrush(*GetColour(COLOUR_BLACK), wxBRUSHSTYLE_TRANSPARENT); + break; + case BRUSH_WHITE: + brush = new wxBrush(*GetColour(COLOUR_WHITE), wxBRUSHSTYLE_SOLID); + break; + default: + wxFAIL; + } + ms_stockObject[item] = brush; } + return brush; } -void wxPenList::AddPen (wxPen * pen) +const wxColour* wxStockGDI::GetColour(Item item) { - Append (pen); + wxColour* colour = static_cast(ms_stockObject[item]); + if (colour == NULL) + { + switch (item) + { + case COLOUR_BLACK: + colour = new wxColour(0, 0, 0); + break; + case COLOUR_BLUE: + colour = new wxColour(0, 0, 255); + break; + case COLOUR_CYAN: + colour = new wxColour(wxT("CYAN")); + break; + 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; + case COLOUR_RED: + colour = new wxColour(255, 0, 0); + break; + case COLOUR_WHITE: + colour = new wxColour(255, 255, 255); + break; + default: + wxFAIL; + } + ms_stockObject[item] = colour; + } + return colour; } -void wxPenList::RemovePen (wxPen * pen) +const wxCursor* wxStockGDI::GetCursor(Item item) { - DeleteObject (pen); + wxCursor* cursor = static_cast(ms_stockObject[item]); + if (cursor == NULL) + { + switch (item) + { + case CURSOR_CROSS: + cursor = new wxCursor(wxCURSOR_CROSS); + break; + case CURSOR_HOURGLASS: + cursor = new wxCursor(wxCURSOR_WAIT); + break; + case CURSOR_STANDARD: + cursor = new wxCursor(wxCURSOR_ARROW); + break; + default: + wxFAIL; + } + ms_stockObject[item] = cursor; + } + return cursor; } -wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, int width, int style) +const wxFont* wxStockGDI::GetFont(Item item) { - for (wxList::compatibility_iterator node = GetFirst (); node; node = node->GetNext ()) + wxFont* font = static_cast(ms_stockObject[item]); + if (font == NULL) { - wxPen *each_pen = (wxPen *) node->GetData (); - if (each_pen && - each_pen->GetVisible() && - each_pen->GetWidth () == width && - each_pen->GetStyle () == style && - each_pen->GetColour ().Red () == colour.Red () && - each_pen->GetColour ().Green () == colour.Green () && - each_pen->GetColour ().Blue () == colour.Blue ()) - return each_pen; + switch (item) + { + case FONT_ITALIC: + font = new wxFont(GetFont(FONT_NORMAL)->GetPointSize(), wxROMAN, wxITALIC, wxNORMAL); + break; + case FONT_NORMAL: + font = new wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); + break; + case FONT_SMALL: + font = new wxFont(GetFont(FONT_NORMAL)->GetPointSize() + // Using the font 2 points smaller than the normal one + // results in font so small as to be unreadable under MSW. + // We might want to actually use -1 under the other + // platforms too but for now be conservative and keep -2 + // there for compatibility with the old behaviour as the + // small font seems to be readable enough there as it is. +#ifdef __WXMSW__ + - 1, +#else + - 2, +#endif + wxSWISS, wxNORMAL, wxNORMAL); + break; + case FONT_SWISS: + font = new wxFont(GetFont(FONT_NORMAL)->GetPointSize(), wxSWISS, wxNORMAL, wxNORMAL); + break; + default: + wxFAIL; + } + ms_stockObject[item] = font; } + return font; +} - wxPen *pen = new wxPen (colour, width, style); - if ( !pen->Ok() ) +const wxPen* wxStockGDI::GetPen(Item item) +{ + wxPen* pen = static_cast(ms_stockObject[item]); + if (pen == NULL) { - // don't save the invalid pens in the list - delete pen; - - return NULL; + switch (item) + { + case PEN_BLACK: + pen = new wxPen(*GetColour(COLOUR_BLACK), 1, wxPENSTYLE_SOLID); + break; + 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; + case PEN_LIGHTGREY: + pen = new wxPen(*GetColour(COLOUR_LIGHTGREY), 1, wxPENSTYLE_SOLID); + break; + case PEN_MEDIUMGREY: + pen = new wxPen(wxColour(wxT("MEDIUM GREY")), 1, wxPENSTYLE_SOLID); + break; + case PEN_RED: + pen = new wxPen(*GetColour(COLOUR_RED), 1, wxPENSTYLE_SOLID); + break; + case PEN_TRANSPARENT: + pen = new wxPen(*GetColour(COLOUR_BLACK), 1, wxPENSTYLE_TRANSPARENT); + break; + case PEN_WHITE: + pen = new wxPen(*GetColour(COLOUR_WHITE), 1, wxPENSTYLE_SOLID); + break; + default: + wxFAIL; + } + ms_stockObject[item] = pen; } + return pen; +} - AddPen(pen); - - // we'll delete it ourselves later - pen->SetVisible(true); +void wxInitializeStockLists() +{ + wxTheColourDatabase = new wxColourDatabase; - return pen; + wxTheBrushList = new wxBrushList; + wxThePenList = new wxPenList; + wxTheFontList = new wxFontList; } -wxBrushList::~wxBrushList () +void wxDeleteStockLists() { - wxList::compatibility_iterator node = GetFirst (); - while (node) - { - wxBrush *brush = (wxBrush *) node->GetData (); - wxList::compatibility_iterator next = node->GetNext (); - if (brush && brush->GetVisible()) - delete brush; - node = next; - } + wxDELETE(wxTheBrushList); + wxDELETE(wxThePenList); + wxDELETE(wxTheFontList); + + // wxTheColourDatabase is cleaned up by wxAppBase::CleanUp() } -void wxBrushList::AddBrush (wxBrush * brush) +// ============================================================================ +// wxTheXXXList stuff (semi-obsolete) +// ============================================================================ + +wxGDIObjListBase::wxGDIObjListBase() { - Append (brush); } -wxBrush *wxBrushList::FindOrCreateBrush (const wxColour& colour, int style) +wxGDIObjListBase::~wxGDIObjListBase() { - for (wxList::compatibility_iterator node = GetFirst (); node; node = node->GetNext ()) + for (wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext()) { - wxBrush *each_brush = (wxBrush *) node->GetData (); - if (each_brush && - each_brush->GetVisible() && - each_brush->GetStyle () == style && - each_brush->GetColour ().Red () == colour.Red () && - each_brush->GetColour ().Green () == colour.Green () && - each_brush->GetColour ().Blue () == colour.Blue ()) - return each_brush; + delete static_cast(node->GetData()); } +} - wxBrush *brush = new wxBrush (colour, style); - - if ( !brush->Ok() ) +wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, int width, wxPenStyle style) +{ + for ( wxList::compatibility_iterator node = list.GetFirst(); + node; + node = node->GetNext() ) { - // don't put the brushes we failed to create into the list - delete brush; - - return NULL; + wxPen * const pen = (wxPen *) node->GetData(); + if ( pen->GetWidth () == width && + pen->GetStyle () == style && + pen->GetColour() == colour ) + return pen; } - AddBrush(brush); - - // we'll delete it ourselves later - brush->SetVisible(true); - - return brush; -} + wxPen* pen = NULL; + wxPen penTmp(colour, width, style); + if (penTmp.IsOk()) + { + pen = new wxPen(penTmp); + list.Append(pen); + } -void wxBrushList::RemoveBrush (wxBrush * brush) -{ - DeleteObject (brush); + return pen; } -wxFontList::~wxFontList () +wxBrush *wxBrushList::FindOrCreateBrush (const wxColour& colour, wxBrushStyle style) { - wxList::compatibility_iterator node = GetFirst (); - while (node) + for ( wxList::compatibility_iterator node = list.GetFirst(); + node; + node = node->GetNext() ) { - // 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->GetData (); - wxList::compatibility_iterator next = node->GetNext (); - if (font->GetVisible()) - delete font; - node = next; + wxBrush * const brush = (wxBrush *) node->GetData (); + if ( brush->GetStyle() == style && brush->GetColour() == colour ) + return brush; } -} -void wxFontList::AddFont (wxFont * font) -{ - Append (font); -} + wxBrush* brush = NULL; + wxBrush brushTmp(colour, style); + if (brushTmp.IsOk()) + { + brush = new wxBrush(brushTmp); + list.Append(brush); + } -void wxFontList::RemoveFont (wxFont * font) -{ - DeleteObject (font); + return brush; } wxFont *wxFontList::FindOrCreateFont(int pointSize, - int family, - int style, - int weight, + wxFontFamily family, + wxFontStyle style, + wxFontWeight weight, bool underline, const wxString& facename, wxFontEncoding encoding) { - wxFont *font = (wxFont *)NULL; + wxFont *font; wxList::compatibility_iterator node; - for ( node = GetFirst(); node; node = node->GetNext() ) + for (node = list.GetFirst(); node; node = node->GetNext()) { font = (wxFont *)node->GetData(); - if ( font->GetVisible() && - font->Ok() && + if ( font->GetPointSize () == pointSize && font->GetStyle () == style && font->GetWeight () == weight && font->GetUnderlined () == underline ) { - int fontFamily = font->GetFamily(); + wxFontFamily fontFamily = (wxFontFamily)font->GetFamily(); #if defined(__WXGTK__) // under GTK the default family is wxSWISS, so looking for a font // with wxDEFAULT family should return a wxSWISS one instead of // creating a new one bool same = (fontFamily == family) || - (fontFamily == wxSWISS && family == wxDEFAULT); + (fontFamily == wxFONTFAMILY_SWISS && family == wxFONTFAMILY_DEFAULT); #else // !GTK // VZ: but why elsewhere do we require an exact match? mystery... bool same = fontFamily == family; @@ -896,30 +869,26 @@ wxFont *wxFontList::FindOrCreateFont(int pointSize, } } - if ( !node ) + // font not found, create the new one + font = NULL; + wxFont fontTmp(pointSize, family, style, weight, underline, facename, encoding); + if (fontTmp.IsOk()) { - // font not found, create the new one - font = new wxFont(pointSize, family, style, weight, - underline, facename, encoding); - - AddFont(font); - - // and mark it as being cacheable - font->SetVisible(true); + font = new wxFont(fontTmp); + list.Append(font); } return font; } -void wxBitmapList::AddBitmap(wxBitmap *bitmap) -{ - Append(bitmap); -} - -void wxBitmapList::RemoveBitmap(wxBitmap *bitmap) -{ - DeleteObject(bitmap); -} +#if WXWIN_COMPATIBILITY_2_6 +void wxBrushList::AddBrush(wxBrush*) { } +void wxBrushList::RemoveBrush(wxBrush*) { } +void wxFontList::AddFont(wxFont*) { } +void wxFontList::RemoveFont(wxFont*) { } +void wxPenList::AddPen(wxPen*) { } +void wxPenList::RemovePen(wxPen*) { } +#endif wxSize wxGetDisplaySize() { @@ -942,6 +911,15 @@ wxSize wxGetDisplaySizeMM() return wxSize(x, y); } +wxSize wxGetDisplayPPI() +{ + const wxSize pixels = wxGetDisplaySize(); + const wxSize mm = wxGetDisplaySizeMM(); + + return wxSize((int)((pixels.x * inches2mm) / mm.x), + (int)((pixels.y * inches2mm) / mm.y)); +} + wxResourceCache::~wxResourceCache () { wxList::compatibility_iterator node = GetFirst ();