X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8f520a56b7bacb0c685526188dd5f7bdbf186470..e0c5c96f67eaf13ccbd378616bdf98c8dba01e78:/src/common/gdicmn.cpp diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp index 2c01bccc06..049d1339dd 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 @@ -43,7 +43,7 @@ #include #ifdef __WXMSW__ -#include +#include "wx/msw/wrapwin.h" #endif #ifdef __WXMOTIF__ @@ -64,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) @@ -187,27 +213,47 @@ bool wxRect::Intersects(const wxRect& rect) const return r.width != 0; } -WX_DECLARE_STRING_HASH_MAP( wxColour*, wxStringToColourHashMap ); +// ============================================================================ +// wxColourDatabase +// ============================================================================ + +WX_DECLARE_STRING_HASH_MAP( wxColour *, wxStringToColourHashMap ); + +// ---------------------------------------------------------------------------- +// wxColourDatabase ctor/dtor +// ---------------------------------------------------------------------------- wxColourDatabase::wxColourDatabase () { - m_map = new wxStringToColourHashMap; + // will be created on demand in Initialize() + m_map = NULL; } wxColourDatabase::~wxColourDatabase () { - WX_CLEAR_HASH_MAP(wxStringToColourHashMap, *m_map); + if ( m_map ) + { + WX_CLEAR_HASH_MAP(wxStringToColourHashMap, *m_map); + + delete m_map; + } - delete m_map; - m_map = NULL; #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; @@ -285,17 +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("YELLOW GREEN"), 153, 204, 50} }; - size_t n; + size_t n; for ( n = 0; n < WXSIZEOF(wxColourTable); n++ ) { const wxColourDesc& cc = wxColourTable[n]; - AddColour(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++ ) @@ -307,99 +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) -{ - return FindColour(colour, true); -} +// ---------------------------------------------------------------------------- +// wxColourDatabase operations +// ---------------------------------------------------------------------------- -wxColour *wxColourDatabase::FindColourNoAdd(const wxString& colour) const +void wxColourDatabase::AddColour(const wxString& name, const wxColour& colour) { - return ((wxColourDatabase*)this)->FindColour(colour, false); -} + Initialize(); -void wxColourDatabase::AddColour (const wxString& name, wxColour* colour) -{ + // 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(); + + // ... and we also allow both grey/gray + wxString colNameAlt = colName; + if ( !colNameAlt.Replace(_T("GRAY"), _T("GREY")) ) + { + // but in this case it is not necessary so avoid extra search below + colNameAlt.clear(); + } wxStringToColourHashMap::iterator it = m_map->find(colName); - if ( it == m_map->end() ) - it = m_map->find(colName2); + if ( it == m_map->end() && !colNameAlt.empty() ) + it = m_map->find(colNameAlt); if ( it != m_map->end() ) { - delete it->second; - it->second = colour; + *(it->second) = colour; + } + else // new colour + { + (*m_map)[name] = new wxColour(colour); } - - (*m_map)[name] = colour; } -wxColour *wxColourDatabase::FindColour(const wxString& colour, bool add) +wxColour wxColourDatabase::Find(const wxString& colour) const { - // VZ: make the comparaison case insensitive and also match both grey and - // gray + 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 colName2 = colName; - if ( !colName2.Replace(_T("GRAY"), _T("GREY")) ) - colName2.clear(); + wxString colNameAlt = colName; + if ( !colNameAlt.Replace(_T("GRAY"), _T("GREY")) ) + colNameAlt.clear(); wxStringToColourHashMap::iterator it = m_map->find(colName); - if ( it == m_map->end() ) - it = m_map->find(colName2); + if ( it == m_map->end() && !colNameAlt.empty() ) + it = m_map->find(colNameAlt); if ( it != m_map->end() ) - return it->second; - - if ( !add ) - return NULL; - -#ifdef __WXMSW__ - return NULL; -#endif -#ifdef __WXPM__ - return NULL; -#endif -#ifdef __WXMGL__ - return NULL; -#endif + return *(it->second); -// 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 + // if we didn't find it, query the system, maybe it knows about it +#if defined(__WXGTK__) || defined(__X__) + wxColour col = wxColour::CreateByName(colour); -#ifdef __WXGTK__ - wxColour *col = new wxColour( colour ); - - if (!(col->Ok())) - { - delete col; - return (wxColour *) NULL; - } - AddColour(colour, col); - return col; -#endif + if ( col.Ok() ) + { + // cache it + self->AddColour(colour, col); + } -#ifdef __X__ + return col; +#elif defined(__X__) + // TODO: move this to wxColour::CreateByName() XColor xcolour; #ifdef __WXMOTIF__ @@ -410,7 +430,7 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour, bool add) #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); @@ -422,36 +442,71 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour, bool add) unsigned char b = (unsigned char)(xcolour.blue >> 8); #endif - wxColour *col = new wxColour(r, g, b); + 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 { - unsigned char red = colour.Red (); - unsigned char green = colour.Green (); - unsigned char blue = colour.Blue (); + wxColourDatabase * const self = wxConstCast(this, wxColourDatabase); + self->Initialize(); typedef wxStringToColourHashMap::iterator iterator; - for (iterator it = m_map->begin(), en = m_map->end(); it != en; ++it ) + for ( iterator it = m_map->begin(), en = m_map->end(); it != en; ++it ) { - wxColour *col = it->second; - - if (col->Red () == red && col->Green () == green && col->Blue () == blue) + if ( *(it->second) == colour ) return it->first; } return wxEmptyString; } +// ---------------------------------------------------------------------------- +// deprecated wxColourDatabase methods +// ---------------------------------------------------------------------------- + +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() { wxTheColourDatabase = new wxColourDatabase; - wxTheColourDatabase->Initialize(); wxTheBrushList = new wxBrushList; wxThePenList = new wxPenList; @@ -476,6 +531,7 @@ void wxInitializeStockObjects () #endif */ #if defined(__WXMAC__) + // retrieve size of system font for all stock fonts int sizeFont = 12; Str255 fontName ; @@ -484,7 +540,12 @@ void wxInitializeStockObjects () GetThemeFont(kThemeSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ; sizeFont = fontSize ; - wxSWISS_FONT = new wxFont (fontSize, wxSWISS, wxNORMAL, wxNORMAL , false , wxMacMakeStringFromPascal(fontName) ); +#if __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 @@ -502,10 +563,15 @@ 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); +#if __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);