X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7cf41a5d66bec0a1297f1417852647aa353a148f..b7005dfd8a49d599a26e78bee3a42737f554a91c:/src/common/gdicmn.cpp diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp index a81555a5cc..885ebec144 100644 --- a/src/common/gdicmn.cpp +++ b/src/common/gdicmn.cpp @@ -17,6 +17,7 @@ #endif #include "wx/gdicmn.h" +#include "wx/gdiobj.h" #ifndef WX_PRECOMP #include "wx/log.h" @@ -24,13 +25,18 @@ #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 -#include "wx/font.h" + +IMPLEMENT_ABSTRACT_CLASS(wxGDIObject, wxObject) + WXDLLIMPEXP_DATA_CORE(wxBrushList*) wxTheBrushList; WXDLLIMPEXP_DATA_CORE(wxFontList*) wxTheFontList; @@ -48,10 +54,15 @@ 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 // wxPoint @@ -104,23 +115,6 @@ wxRect::wxRect(const wxPoint& point1, const wxPoint& point2) height++; } -bool wxRect::operator==(const wxRect& rect) const -{ - return ((x == rect.x) && - (y == rect.y) && - (width == rect.width) && - (height == rect.height)); -} - -wxRect wxRect::operator+(const wxRect& rect) const -{ - int x1 = wxMin(this->x, 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 @@ -179,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) @@ -187,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(), @@ -221,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 // ============================================================================ @@ -318,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}, @@ -374,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(); @@ -402,7 +438,7 @@ wxColour wxColourDatabase::Find(const wxString& colour) const 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); @@ -463,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); @@ -490,47 +526,49 @@ void wxStockGDI::DeleteAll() { for (unsigned i = 0; i < ITEMCOUNT; i++) { - delete ms_stockObject[i]; - ms_stockObject[i] = NULL; + wxDELETE(ms_stockObject[i]); } } const wxBrush* wxStockGDI::GetBrush(Item item) { - wxBrush* brush = wx_static_cast(wxBrush*, ms_stockObject[item]); + wxBrush* brush = static_cast(ms_stockObject[item]); if (brush == NULL) { switch (item) { case BRUSH_BLACK: - brush = new wxBrush(*GetColour(COLOUR_BLACK), wxSOLID); + brush = new wxBrush(*GetColour(COLOUR_BLACK), wxBRUSHSTYLE_SOLID); break; case BRUSH_BLUE: - brush = new wxBrush(*GetColour(COLOUR_BLUE), wxSOLID); + brush = new wxBrush(*GetColour(COLOUR_BLUE), wxBRUSHSTYLE_SOLID); break; case BRUSH_CYAN: - brush = new wxBrush(*GetColour(COLOUR_CYAN), wxSOLID); + brush = new wxBrush(*GetColour(COLOUR_CYAN), wxBRUSHSTYLE_SOLID); break; case BRUSH_GREEN: - brush = new wxBrush(*GetColour(COLOUR_GREEN), wxSOLID); + 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")), wxSOLID); + brush = new wxBrush(wxColour(wxT("GREY")), wxBRUSHSTYLE_SOLID); break; case BRUSH_LIGHTGREY: - brush = new wxBrush(*GetColour(COLOUR_LIGHTGREY), wxSOLID); + brush = new wxBrush(*GetColour(COLOUR_LIGHTGREY), wxBRUSHSTYLE_SOLID); break; case BRUSH_MEDIUMGREY: - brush = new wxBrush(wxColour(wxT("MEDIUM GREY")), wxSOLID); + brush = new wxBrush(wxColour(wxT("MEDIUM GREY")), wxBRUSHSTYLE_SOLID); break; case BRUSH_RED: - brush = new wxBrush(*GetColour(COLOUR_RED), wxSOLID); + brush = new wxBrush(*GetColour(COLOUR_RED), wxBRUSHSTYLE_SOLID); break; case BRUSH_TRANSPARENT: - brush = new wxBrush(*GetColour(COLOUR_BLACK), wxTRANSPARENT); + brush = new wxBrush(*GetColour(COLOUR_BLACK), wxBRUSHSTYLE_TRANSPARENT); break; case BRUSH_WHITE: - brush = new wxBrush(*GetColour(COLOUR_WHITE), wxSOLID); + brush = new wxBrush(*GetColour(COLOUR_WHITE), wxBRUSHSTYLE_SOLID); break; default: wxFAIL; @@ -542,7 +580,7 @@ const wxBrush* wxStockGDI::GetBrush(Item item) const wxColour* wxStockGDI::GetColour(Item item) { - wxColour* colour = wx_static_cast(wxColour*, ms_stockObject[item]); + wxColour* colour = static_cast(ms_stockObject[item]); if (colour == NULL) { switch (item) @@ -559,6 +597,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; @@ -578,7 +619,7 @@ const wxColour* wxStockGDI::GetColour(Item item) const wxCursor* wxStockGDI::GetCursor(Item item) { - wxCursor* cursor = wx_static_cast(wxCursor*, ms_stockObject[item]); + wxCursor* cursor = static_cast(ms_stockObject[item]); if (cursor == NULL) { switch (item) @@ -602,7 +643,7 @@ const wxCursor* wxStockGDI::GetCursor(Item item) const wxFont* wxStockGDI::GetFont(Item item) { - wxFont* font = wx_static_cast(wxFont*, ms_stockObject[item]); + wxFont* font = static_cast(ms_stockObject[item]); if (font == NULL) { switch (item) @@ -614,7 +655,19 @@ const wxFont* wxStockGDI::GetFont(Item item) font = new wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); break; case FONT_SMALL: - font = new wxFont(GetFont(FONT_NORMAL)->GetPointSize() - 2, wxSWISS, wxNORMAL, wxNORMAL); + 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); @@ -629,40 +682,46 @@ const wxFont* wxStockGDI::GetFont(Item item) const wxPen* wxStockGDI::GetPen(Item item) { - wxPen* pen = wx_static_cast(wxPen*, ms_stockObject[item]); + wxPen* pen = static_cast(ms_stockObject[item]); if (pen == NULL) { switch (item) { case PEN_BLACK: - pen = new wxPen(*GetColour(COLOUR_BLACK), 1, wxSOLID); + pen = new wxPen(*GetColour(COLOUR_BLACK), 1, wxPENSTYLE_SOLID); break; case PEN_BLACKDASHED: - pen = new wxPen(*GetColour(COLOUR_BLACK), 1, wxSHORT_DASH); + 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, wxSOLID); + pen = new wxPen(*GetColour(COLOUR_CYAN), 1, wxPENSTYLE_SOLID); break; case PEN_GREEN: - pen = new wxPen(*GetColour(COLOUR_GREEN), 1, wxSOLID); + 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, wxSOLID); + pen = new wxPen(wxColour(wxT("GREY")), 1, wxPENSTYLE_SOLID); break; case PEN_LIGHTGREY: - pen = new wxPen(*GetColour(COLOUR_LIGHTGREY), 1, wxSOLID); + pen = new wxPen(*GetColour(COLOUR_LIGHTGREY), 1, wxPENSTYLE_SOLID); break; case PEN_MEDIUMGREY: - pen = new wxPen(wxColour(wxT("MEDIUM GREY")), 1, wxSOLID); + pen = new wxPen(wxColour(wxT("MEDIUM GREY")), 1, wxPENSTYLE_SOLID); break; case PEN_RED: - pen = new wxPen(*GetColour(COLOUR_RED), 1, wxSOLID); + pen = new wxPen(*GetColour(COLOUR_RED), 1, wxPENSTYLE_SOLID); break; case PEN_TRANSPARENT: - pen = new wxPen(*GetColour(COLOUR_BLACK), 1, wxTRANSPARENT); + pen = new wxPen(*GetColour(COLOUR_BLACK), 1, wxPENSTYLE_TRANSPARENT); break; case PEN_WHITE: - pen = new wxPen(*GetColour(COLOUR_WHITE), 1, wxSOLID); + pen = new wxPen(*GetColour(COLOUR_WHITE), 1, wxPENSTYLE_SOLID); break; default: wxFAIL; @@ -686,6 +745,8 @@ void wxDeleteStockLists() wxDELETE(wxTheBrushList); wxDELETE(wxThePenList); wxDELETE(wxTheFontList); + + // wxTheColourDatabase is cleaned up by wxAppBase::CleanUp() } // ============================================================================ @@ -700,27 +761,26 @@ wxGDIObjListBase::~wxGDIObjListBase() { for (wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext()) { - delete wx_static_cast(wxObject*, node->GetData()); + delete static_cast(node->GetData()); } } -wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, int width, int style) +wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, int width, wxPenStyle style) { - for (wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext()) + for ( wxList::compatibility_iterator node = list.GetFirst(); + node; + node = node->GetNext() ) { - wxPen *each_pen = (wxPen *) node->GetData (); - if ( - 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; + wxPen * const pen = (wxPen *) node->GetData(); + if ( pen->GetWidth () == width && + pen->GetStyle () == style && + pen->GetColour() == colour ) + return pen; } wxPen* pen = NULL; wxPen penTmp(colour, width, style); - if (penTmp.Ok()) + if (penTmp.IsOk()) { pen = new wxPen(penTmp); list.Append(pen); @@ -729,22 +789,20 @@ wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, int width, int style) return pen; } -wxBrush *wxBrushList::FindOrCreateBrush (const wxColour& colour, int style) +wxBrush *wxBrushList::FindOrCreateBrush (const wxColour& colour, wxBrushStyle style) { - for (wxList::compatibility_iterator node = list.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->GetStyle () == style && - each_brush->GetColour ().Red () == colour.Red () && - each_brush->GetColour ().Green () == colour.Green () && - each_brush->GetColour ().Blue () == colour.Blue ()) - return each_brush; + wxBrush * const brush = (wxBrush *) node->GetData (); + if ( brush->GetStyle() == style && brush->GetColour() == colour ) + return brush; } wxBrush* brush = NULL; wxBrush brushTmp(colour, style); - if (brushTmp.Ok()) + if (brushTmp.IsOk()) { brush = new wxBrush(brushTmp); list.Append(brush); @@ -754,9 +812,9 @@ wxBrush *wxBrushList::FindOrCreateBrush (const wxColour& colour, int style) } wxFont *wxFontList::FindOrCreateFont(int pointSize, - int family, - int style, - int weight, + wxFontFamily family, + wxFontStyle style, + wxFontWeight weight, bool underline, const wxString& facename, wxFontEncoding encoding) @@ -772,14 +830,14 @@ wxFont *wxFontList::FindOrCreateFont(int pointSize, 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; @@ -814,7 +872,7 @@ wxFont *wxFontList::FindOrCreateFont(int pointSize, // font not found, create the new one font = NULL; wxFont fontTmp(pointSize, family, style, weight, underline, facename, encoding); - if (fontTmp.Ok()) + if (fontTmp.IsOk()) { font = new wxFont(fontTmp); list.Append(font); @@ -853,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 ();