X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/59571b718e142de7159c6ad3a86d15d4e896593a..0bbe61b8c18a1795189f0cf73cc61c14a0fb846d:/src/common/gdicmn.cpp?ds=sidebyside diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp index a4b09c9493..a79f31aa2c 100644 --- a/src/common/gdicmn.cpp +++ b/src/common/gdicmn.cpp @@ -25,6 +25,7 @@ #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" @@ -33,7 +34,7 @@ #endif -IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject) +IMPLEMENT_ABSTRACT_CLASS(wxGDIObject, wxObject) WXDLLIMPEXP_DATA_CORE(wxBrushList*) wxTheBrushList; @@ -52,10 +53,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 @@ -108,23 +114,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 @@ -230,6 +219,38 @@ 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); +} + // ============================================================================ // wxColourDatabase // ============================================================================ @@ -512,34 +533,34 @@ const wxBrush* wxStockGDI::GetBrush(Item item) 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_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; @@ -644,34 +665,34 @@ const wxPen* wxStockGDI::GetPen(Item item) 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_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_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; @@ -713,18 +734,17 @@ wxGDIObjListBase::~wxGDIObjListBase() } } -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; @@ -738,17 +758,15 @@ 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; @@ -763,9 +781,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) @@ -781,14 +799,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;