X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bfec7058d4c9f8d41c38ce1ddcbc2670548cf5c2..d3d0974f0f4ea623b5255db0b70b5e8374bf9d3f:/src/common/gdicmn.cpp diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp index c797b70ca2..ac407e93d9 100644 --- a/src/common/gdicmn.cpp +++ b/src/common/gdicmn.cpp @@ -9,7 +9,7 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "gdicmn.h" #endif @@ -37,12 +37,13 @@ #include "wx/dc.h" #include "wx/utils.h" #include "wx/settings.h" +#include "wx/hashmap.h" #include "wx/log.h" #include #ifdef __WXMSW__ -#include +#include "wx/msw/wrapwin.h" #endif #ifdef __WXMOTIF__ @@ -63,33 +64,59 @@ #include "wx/mac/private.h" #include "wx/mac/uma.h" #endif -IMPLEMENT_CLASS(wxColourDatabase, wxList) -IMPLEMENT_DYNAMIC_CLASS(wxFontList, wxList) -IMPLEMENT_DYNAMIC_CLASS(wxPenList, wxList) -IMPLEMENT_DYNAMIC_CLASS(wxBrushList, wxList) -IMPLEMENT_DYNAMIC_CLASS(wxBitmapList, wxList) -IMPLEMENT_DYNAMIC_CLASS(wxResourceCache, wxList) + +#if wxUSE_EXTENDED_RTTI + +// wxPoint + +template<> void wxStringReadValue(const wxString &s , wxPoint &data ) +{ + wxSscanf(s, wxT("%d,%d"), &data.x , &data.y ) ; +} + +template<> void wxStringWriteValue(wxString &s , const wxPoint &data ) +{ + s = wxString::Format(wxT("%d,%d"), data.x , data.y ) ; +} + +wxCUSTOM_TYPE_INFO(wxPoint, wxToStringConverter , wxFromStringConverter) + +template<> void wxStringReadValue(const wxString &s , wxSize &data ) +{ + wxSscanf(s, wxT("%d,%d"), &data.x , &data.y ) ; +} + +template<> void wxStringWriteValue(wxString &s , const wxSize &data ) +{ + s = wxString::Format(wxT("%d,%d"), data.x , data.y ) ; +} + +wxCUSTOM_TYPE_INFO(wxSize, wxToStringConverter , wxFromStringConverter) + +#endif IMPLEMENT_ABSTRACT_CLASS(wxDCBase, wxObject) -wxRect::wxRect(const wxPoint& topLeft, const wxPoint& bottomRight) +wxRect::wxRect(const wxPoint& point1, const wxPoint& point2) { - x = topLeft.x; - y = topLeft.y; - width = bottomRight.x - topLeft.x + 1; - height = bottomRight.y - topLeft.y + 1; + x = point1.x; + y = point1.y; + width = point2.x - point1.x; + height = point2.y - point1.y; if (width < 0) { width = -width; - x -= width; + x = point2.x; } + width++; if (height < 0) { height = -height; - y -= height; + y = point2.y; } + height++; } wxRect::wxRect(const wxPoint& point, const wxSize& size) @@ -186,29 +213,47 @@ bool wxRect::Intersects(const wxRect& rect) const return r.width != 0; } -wxColourDatabase::wxColourDatabase (int type) : wxList (type) +// ============================================================================ +// wxColourDatabase +// ============================================================================ + +WX_DECLARE_STRING_HASH_MAP( wxColour *, wxStringToColourHashMap ); + +// ---------------------------------------------------------------------------- +// wxColourDatabase ctor/dtor +// ---------------------------------------------------------------------------- + +wxColourDatabase::wxColourDatabase () { + // will be created on demand in Initialize() + m_map = NULL; } wxColourDatabase::~wxColourDatabase () { - // Cleanup Colour allocated in Initialize() - wxNode *node = GetFirst (); - while (node) + if ( m_map ) { - wxColour *col = (wxColour *) node->GetData (); - wxNode *next = node->GetNext (); - delete col; - node = next; + WX_CLEAR_HASH_MAP(wxStringToColourHashMap, *m_map); + + delete m_map; } + #ifdef __WXPM__ delete [] m_palTable; #endif } // Colour database stuff -void wxColourDatabase::Initialize () +void wxColourDatabase::Initialize() { + if ( m_map ) + { + // already initialized + return; + } + + m_map = new wxStringToColourHashMap; + static const struct wxColourDesc { const wxChar *name; @@ -286,20 +331,17 @@ void wxColourDatabase::Initialize () {wxT("WHEAT"), 216, 216, 191}, {wxT("WHITE"), 255, 255, 255}, {wxT("YELLOW"), 255, 255, 0}, - {wxT("YELLOW GREEN"), 153, 204, 50}, - {wxT("MEDIUM GOLDENROD"), 234, 234, 173}, - {wxT("MEDIUM FOREST GREEN"), 107, 142, 35}, - {wxT("LIGHT MAGENTA"), 255, 0, 255}, - {wxT("MEDIUM GREY"), 100, 100, 100}, + {wxT("YELLOW GREEN"), 153, 204, 50} }; - size_t n; + size_t n; for ( n = 0; n < WXSIZEOF(wxColourTable); n++ ) { const wxColourDesc& cc = wxColourTable[n]; - Append(cc.name, new wxColour(cc.r,cc.g,cc.b)); + (*m_map)[cc.name] = new wxColour(cc.r, cc.g, cc.b); } + #ifdef __WXPM__ m_palTable = new long[n]; for ( n = 0; n < WXSIZEOF(wxColourTable); n++ ) @@ -311,72 +353,73 @@ void wxColourDatabase::Initialize () #endif } -/* - * Changed by Ian Brown, July 1994. - * - * When running under X, the Colour Database starts off empty. The X server - * is queried for the colour first time after which it is entered into the - * database. This allows our client to use the server colour database which - * is hopefully gamma corrected for the display being used. - */ - -wxColour *wxColourDatabase::FindColour(const wxString& colour) -{ - // VZ: make the comparaison case insensitive and also match both grey and - // gray - wxString colName = colour; +// ---------------------------------------------------------------------------- +// wxColourDatabase operations +// ---------------------------------------------------------------------------- + +void wxColourDatabase::AddColour(const wxString& name, const wxColour& colour) +{ + Initialize(); + + // canonicalize the colour names before using them as keys: they should be + // in upper case + wxString colName = name; colName.MakeUpper(); - wxString colName2 = colName; - if ( !colName2.Replace(_T("GRAY"), _T("GREY")) ) - colName2.clear(); - wxNode *node = GetFirst(); - while ( node ) + // ... and we also allow both grey/gray + wxString colNameAlt = colName; + if ( !colNameAlt.Replace(_T("GRAY"), _T("GREY")) ) { - const wxChar *key = node->GetKeyString(); - if ( colName == key || colName2 == key ) - { - return (wxColour *)node->GetData(); - } + // but in this case it is not necessary so avoid extra search below + colNameAlt.clear(); + } - node = node->GetNext(); + wxStringToColourHashMap::iterator it = m_map->find(colName); + if ( it == m_map->end() && !colNameAlt.empty() ) + it = m_map->find(colNameAlt); + if ( it != m_map->end() ) + { + *(it->second) = colour; + } + else // new colour + { + (*m_map)[name] = new wxColour(colour); } +} -#ifdef __WXMSW__ - return NULL; -#endif -#ifdef __WXPM__ - return NULL; -#endif -#ifdef __WXMGL__ - return NULL; -#endif +wxColour wxColourDatabase::Find(const wxString& colour) const +{ + wxColourDatabase * const self = wxConstCast(this, wxColourDatabase); + self->Initialize(); -// TODO for other implementations. This should really go into -// platform-specific directories. -#ifdef __WXMAC__ - return NULL; -#endif -#ifdef __WXCOCOA__ - return NULL; -#endif -#ifdef __WXSTUBS__ - return NULL; -#endif + // first look among the existing colours -#ifdef __WXGTK__ - wxColour *col = new wxColour( colour ); + // 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")) ) + colNameAlt.clear(); - if (!(col->Ok())) - { - delete col; - return (wxColour *) NULL; - } - Append( colour, col ); - return col; -#endif + wxStringToColourHashMap::iterator it = m_map->find(colName); + if ( it == m_map->end() && !colNameAlt.empty() ) + it = m_map->find(colNameAlt); + if ( it != m_map->end() ) + return *(it->second); -#ifdef __X__ + // 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__ @@ -387,7 +430,7 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour) #endif /* MATTHEW: [4] Use wxGetMainColormap */ if (!XParseColor(display, (Colormap) wxTheApp->GetMainColormap((WXDisplay*) display), colour.ToAscii() ,&xcolour)) - return NULL; + return NULL; #if wxUSE_NANOX unsigned char r = (unsigned char)(xcolour.red); @@ -399,46 +442,76 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour) unsigned char b = (unsigned char)(xcolour.blue >> 8); #endif - wxColour *col = new wxColour(r, g, b); - Append(colour, col); + wxColour col(r, g, b); + AddColour(colour, col); return col; -#endif // __X__ +#else // other platform + return wxNullColour; +#endif // platforms } -wxString wxColourDatabase::FindName (const wxColour& colour) const +wxString wxColourDatabase::FindName(const wxColour& colour) const { - wxString name; + wxColourDatabase * const self = wxConstCast(this, wxColourDatabase); + self->Initialize(); - unsigned char red = colour.Red (); - unsigned char green = colour.Green (); - unsigned char blue = colour.Blue (); + typedef wxStringToColourHashMap::iterator iterator; - for (wxNode * node = GetFirst (); node; node = node->GetNext ()) + for ( iterator it = m_map->begin(), en = m_map->end(); it != en; ++it ) { - wxColour *col = (wxColour *) node->GetData (); + if ( *(it->second) == colour ) + return it->first; + } - if (col->Red () == red && col->Green () == green && col->Blue () == blue) - { - const wxChar *found = node->GetKeyString(); - if ( found ) - { - name = found; + return wxEmptyString; +} - break; - } - } - } +// ---------------------------------------------------------------------------- +// deprecated wxColourDatabase methods +// ---------------------------------------------------------------------------- - return name; +wxColour *wxColourDatabase::FindColour(const wxString& name) +{ + // This function is deprecated, use Find() instead. + // Formerly this function sometimes would return a deletable pointer and + // sometimes a non-deletable one (when returning a colour from the database). + // Trying to delete the latter anyway results in problems, so probably + // nobody ever freed the pointers. Currently it always returns a new + // instance, which means there will be memory leaks. + wxLogDebug(wxT("wxColourDataBase::FindColour():") + wxT(" Please use wxColourDataBase::Find() instead")); + + // using a static variable here is not the most elegant solution but unless + // we want to make wxStringToColourHashMap public (i.e. move it to the + // header) so that we could have a member function returning + // wxStringToColourHashMap::iterator, there is really no good way to do it + // otherwise + // + // and knowing that this function is going to disappear in the next release + // anyhow I don't want to waste time on this + + static wxColour s_col; + + s_col = Find(name); + if ( !s_col.Ok() ) + return NULL; + + return new wxColour(s_col); } +// ============================================================================ +// stock objects +// ============================================================================ + void wxInitializeStockLists() { - wxTheBrushList = new wxBrushList; - wxThePenList = new wxPenList; - wxTheFontList = new wxFontList; - wxTheBitmapList = new wxBitmapList; + wxTheColourDatabase = new wxColourDatabase; + + wxTheBrushList = new wxBrushList; + wxThePenList = new wxPenList; + wxTheFontList = new wxFontList; + wxTheBitmapList = new wxBitmapList; } void wxInitializeStockObjects () @@ -466,7 +539,7 @@ void wxInitializeStockObjects () GetThemeFont(kThemeSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ; sizeFont = fontSize ; - wxSWISS_FONT = new wxFont (fontSize, wxSWISS, wxNORMAL, wxNORMAL , false , wxMacMakeStringFromPascal(fontName) ); + wxNORMAL_FONT = new wxFont (fontSize, wxMODERN, wxNORMAL, wxNORMAL , false , wxMacMakeStringFromPascal(fontName) ); #elif defined(__WXPM__) static const int sizeFont = 12; #else @@ -484,7 +557,7 @@ void wxInitializeStockObjects () wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL); wxSWISS_FONT = new wxFont (sizeFont, wxSWISS, wxNORMAL, wxNORMAL); /* Helv */ #elif defined(__WXMAC__) - wxNORMAL_FONT = new wxFont (sizeFont, wxMODERN, wxNORMAL, wxNORMAL); + wxSWISS_FONT = new wxFont (sizeFont, wxSWISS, wxNORMAL, wxNORMAL); /* Helv */ wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL); GetThemeFont(kThemeSmallSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ; wxSMALL_FONT = new wxFont (fontSize, wxSWISS, wxNORMAL, wxNORMAL , false , wxMacMakeStringFromPascal( fontName ) ); @@ -589,11 +662,11 @@ wxBitmapList::wxBitmapList() wxBitmapList::~wxBitmapList () { - wxNode *node = GetFirst (); + wxList::compatibility_iterator node = GetFirst (); while (node) { wxBitmap *bitmap = (wxBitmap *) node->GetData (); - wxNode *next = node->GetNext (); + wxList::compatibility_iterator next = node->GetNext (); if (bitmap->GetVisible()) delete bitmap; node = next; @@ -603,11 +676,11 @@ wxBitmapList::~wxBitmapList () // Pen and Brush lists wxPenList::~wxPenList () { - wxNode *node = GetFirst (); + wxList::compatibility_iterator node = GetFirst (); while (node) { wxPen *pen = (wxPen *) node->GetData (); - wxNode *next = node->GetNext (); + wxList::compatibility_iterator next = node->GetNext (); if (pen->GetVisible()) delete pen; node = next; @@ -626,7 +699,7 @@ void wxPenList::RemovePen (wxPen * pen) wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, int width, int style) { - for (wxNode * node = GetFirst (); node; node = node->GetNext ()) + for (wxList::compatibility_iterator node = GetFirst (); node; node = node->GetNext ()) { wxPen *each_pen = (wxPen *) node->GetData (); if (each_pen && @@ -658,11 +731,11 @@ wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, int width, int style) wxBrushList::~wxBrushList () { - wxNode *node = GetFirst (); + wxList::compatibility_iterator node = GetFirst (); while (node) { wxBrush *brush = (wxBrush *) node->GetData (); - wxNode *next = node->GetNext (); + wxList::compatibility_iterator next = node->GetNext (); if (brush && brush->GetVisible()) delete brush; node = next; @@ -676,7 +749,7 @@ void wxBrushList::AddBrush (wxBrush * brush) wxBrush *wxBrushList::FindOrCreateBrush (const wxColour& colour, int style) { - for (wxNode * node = GetFirst (); node; node = node->GetNext ()) + for (wxList::compatibility_iterator node = GetFirst (); node; node = node->GetNext ()) { wxBrush *each_brush = (wxBrush *) node->GetData (); if (each_brush && @@ -713,7 +786,7 @@ void wxBrushList::RemoveBrush (wxBrush * brush) wxFontList::~wxFontList () { - wxNode *node = GetFirst (); + wxList::compatibility_iterator node = GetFirst (); while (node) { // Only delete objects that are 'visible', i.e. @@ -721,7 +794,7 @@ wxFontList::~wxFontList () // where the pointers are expected to be shared // (and therefore not deleted by any one part of an app). wxFont *font = (wxFont *) node->GetData (); - wxNode *next = node->GetNext (); + wxList::compatibility_iterator next = node->GetNext (); if (font->GetVisible()) delete font; node = next; @@ -747,7 +820,7 @@ wxFont *wxFontList::FindOrCreateFont(int pointSize, wxFontEncoding encoding) { wxFont *font = (wxFont *)NULL; - wxNode *node; + wxList::compatibility_iterator node; for ( node = GetFirst(); node; node = node->GetNext() ) { font = (wxFont *)node->GetData(); @@ -845,7 +918,7 @@ wxSize wxGetDisplaySizeMM() wxResourceCache::~wxResourceCache () { - wxNode *node = GetFirst (); + wxList::compatibility_iterator node = GetFirst (); while (node) { wxObject *item = (wxObject *)node->GetData(); delete item;