X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f516d986371b7643efda569d64ae19e75d221411..48271822ef3d56c8f91af882b68fd1b674a8e8e6:/src/common/gdicmn.cpp diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp index 18320eb5db..7b6e3db37c 100644 --- a/src/common/gdicmn.cpp +++ b/src/common/gdicmn.cpp @@ -9,48 +9,54 @@ // 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 - -#ifdef __WXMOTIF__ -#ifdef __VMS__ -#pragma message disable nosimpint -#endif -#include -#ifdef __VMS__ -#pragma message enable nosimpint -#endif +#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" #endif -#ifdef __WXX11__ -#include "X11/Xlib.h" + +IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject) + + +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); #if wxUSE_EXTENDED_RTTI @@ -82,8 +88,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 @@ -181,7 +168,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) @@ -189,6 +176,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(), @@ -223,6 +215,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 // ============================================================================ @@ -320,7 +344,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}, @@ -400,8 +424,6 @@ 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(); @@ -415,48 +437,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 @@ -719,7 +705,6 @@ void wxInitializeStockLists() wxTheBrushList = new wxBrushList; wxThePenList = new wxPenList; wxTheFontList = new wxFontList; - wxTheBitmapList = new wxBitmapList; } void wxDeleteStockLists() @@ -727,57 +712,30 @@ void wxDeleteStockLists() wxDELETE(wxTheBrushList); wxDELETE(wxThePenList); wxDELETE(wxTheFontList); - wxDELETE(wxTheBitmapList); } // ============================================================================ // wxTheXXXList stuff (semi-obsolete) // ============================================================================ -wxBitmapList::~wxBitmapList () +wxGDIObjListBase::wxGDIObjListBase() { - wxList::compatibility_iterator node = GetFirst (); - while (node) - { - wxBitmap *bitmap = (wxBitmap *) node->GetData (); - wxList::compatibility_iterator next = node->GetNext (); - if (bitmap->GetVisible()) - delete bitmap; - node = next; - } } -// Pen and Brush lists -wxPenList::~wxPenList () +wxGDIObjListBase::~wxGDIObjListBase() { - wxList::compatibility_iterator node = GetFirst (); - while (node) + for (wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext()) { - wxPen *pen = (wxPen *) node->GetData (); - wxList::compatibility_iterator next = node->GetNext (); - if (pen->GetVisible()) - delete pen; - node = next; + delete wx_static_cast(wxObject*, node->GetData()); } } -void wxPenList::AddPen (wxPen * pen) -{ - Append (pen); -} - -void wxPenList::RemovePen (wxPen * pen) -{ - DeleteObject (pen); -} - wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, int width, int style) { - for (wxList::compatibility_iterator node = 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 && - each_pen->GetVisible() && + if ( each_pen->GetWidth () == width && each_pen->GetStyle () == style && each_pen->GetColour ().Red () == colour.Red () && @@ -786,48 +744,23 @@ wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, int width, int style) return each_pen; } - wxPen *pen = new wxPen (colour, width, style); - if ( !pen->Ok() ) + wxPen* pen = NULL; + wxPen penTmp(colour, width, style); + if (penTmp.Ok()) { - // don't save the invalid pens in the list - delete pen; - - return NULL; + pen = new wxPen(penTmp); + list.Append(pen); } - AddPen(pen); - - // we'll delete it ourselves later - pen->SetVisible(true); - return pen; } -wxBrushList::~wxBrushList () -{ - 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; - } -} - -void wxBrushList::AddBrush (wxBrush * brush) -{ - Append (brush); -} - wxBrush *wxBrushList::FindOrCreateBrush (const wxColour& colour, int style) { - 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() && + if ( each_brush->GetStyle () == style && each_brush->GetColour ().Red () == colour.Red () && each_brush->GetColour ().Green () == colour.Green () && @@ -835,56 +768,17 @@ wxBrush *wxBrushList::FindOrCreateBrush (const wxColour& colour, int style) return each_brush; } - wxBrush *brush = new wxBrush (colour, style); - - if ( !brush->Ok() ) + wxBrush* brush = NULL; + wxBrush brushTmp(colour, style); + if (brushTmp.Ok()) { - // don't put the brushes we failed to create into the list - delete brush; - - return NULL; + brush = new wxBrush(brushTmp); + list.Append(brush); } - AddBrush(brush); - - // we'll delete it ourselves later - brush->SetVisible(true); - return brush; } -void wxBrushList::RemoveBrush (wxBrush * brush) -{ - DeleteObject (brush); -} - -wxFontList::~wxFontList () -{ - 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->GetData (); - wxList::compatibility_iterator next = node->GetNext (); - if (font->GetVisible()) - delete font; - node = next; - } -} - -void wxFontList::AddFont (wxFont * font) -{ - Append (font); -} - -void wxFontList::RemoveFont (wxFont * font) -{ - DeleteObject (font); -} - wxFont *wxFontList::FindOrCreateFont(int pointSize, int family, int style, @@ -893,13 +787,12 @@ wxFont *wxFontList::FindOrCreateFont(int pointSize, 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 && @@ -944,30 +837,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.Ok()) { - // 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() {