X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7ecb8b06ade47981aa828a3f7fb4278f822456d3..ab94455525efa69b50b013ed876a82afb22aacae:/src/common/gdicmn.cpp diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp index d33e03f739..280d4d94c3 100644 --- a/src/common/gdicmn.cpp +++ b/src/common/gdicmn.cpp @@ -5,7 +5,7 @@ // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem +// Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -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__ @@ -55,12 +56,14 @@ #endif #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) +#ifdef __WXX11__ +#include "X11/Xlib.h" +#endif + +#ifdef __WXMAC__ +#include "wx/mac/private.h" +#include "wx/mac/uma.h" +#endif IMPLEMENT_ABSTRACT_CLASS(wxDCBase, wxObject) @@ -178,21 +181,19 @@ bool wxRect::Intersects(const wxRect& rect) const return r.width != 0; } -wxColourDatabase::wxColourDatabase (int type) : wxList (type) +WX_DECLARE_STRING_HASH_MAP( wxColour*, wxStringToColourHashMap ); + +wxColourDatabase::wxColourDatabase () { + m_map = new wxStringToColourHashMap; } wxColourDatabase::~wxColourDatabase () { - // Cleanup Colour allocated in Initialize() - wxNode *node = First (); - while (node) - { - wxColour *col = (wxColour *) node->Data (); - wxNode *next = node->Next (); - delete col; - node = next; - } + WX_CLEAR_HASH_MAP(wxStringToColourHashMap, *m_map); + + delete m_map; + m_map = NULL; #ifdef __WXPM__ delete [] m_palTable; #endif @@ -279,10 +280,7 @@ void wxColourDatabase::Initialize () {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; @@ -290,7 +288,7 @@ void wxColourDatabase::Initialize () for ( n = 0; n < WXSIZEOF(wxColourTable); n++ ) { const wxColourDesc& cc = wxColourTable[n]; - Append(cc.name, new wxColour(cc.r,cc.g,cc.b)); + AddColour(cc.name, new wxColour(cc.r,cc.g,cc.b)); } #ifdef __WXPM__ m_palTable = new long[n]; @@ -313,6 +311,36 @@ void wxColourDatabase::Initialize () */ wxColour *wxColourDatabase::FindColour(const wxString& colour) +{ + return FindColour(colour, true); +} + +wxColour *wxColourDatabase::FindColourNoAdd(const wxString& colour) const +{ + return ((wxColourDatabase*)this)->FindColour(colour, false); +} + +void wxColourDatabase::AddColour (const wxString& name, wxColour* colour) +{ + wxString colName = name; + colName.MakeUpper(); + wxString colName2 = colName; + if ( !colName2.Replace(_T("GRAY"), _T("GREY")) ) + colName2.clear(); + + wxStringToColourHashMap::iterator it = m_map->find(colName); + if ( it == m_map->end() ) + it = m_map->find(colName2); + if ( it != m_map->end() ) + { + delete it->second; + it->second = colour; + } + + (*m_map)[name] = colour; +} + +wxColour *wxColourDatabase::FindColour(const wxString& colour, bool add) { // VZ: make the comparaison case insensitive and also match both grey and // gray @@ -322,17 +350,14 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour) if ( !colName2.Replace(_T("GRAY"), _T("GREY")) ) colName2.clear(); - wxNode *node = First(); - while ( node ) - { - const wxChar *key = node->GetKeyString(); - if ( colName == key || colName2 == key ) - { - return (wxColour *)node->Data(); - } + wxStringToColourHashMap::iterator it = m_map->find(colName); + if ( it == m_map->end() ) + it = m_map->find(colName2); + if ( it != m_map->end() ) + return it->second; - node = node->Next(); - } + if ( !add ) + return NULL; #ifdef __WXMSW__ return NULL; @@ -349,6 +374,9 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour) #ifdef __WXMAC__ return NULL; #endif +#ifdef __WXCOCOA__ + return NULL; +#endif #ifdef __WXSTUBS__ return NULL; #endif @@ -356,11 +384,12 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour) #ifdef __WXGTK__ wxColour *col = new wxColour( colour ); - if (!(col->Ok())) { + if (!(col->Ok())) + { delete col; return (wxColour *) NULL; } - Append( colour, col ); + AddColour(colour, col); return col; #endif @@ -370,22 +399,25 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour) #ifdef __WXMOTIF__ Display *display = XtDisplay((Widget) wxTheApp->GetTopLevelWidget()) ; #endif -#ifdef __XVIEW__ - Xv_Screen screen = xv_get(xview_server, SERVER_NTH_SCREEN, 0); - Xv_opaque root_window = xv_get(screen, XV_ROOT); - Display *display = (Display *)xv_get(root_window, XV_DISPLAY); +#ifdef __WXX11__ + Display* display = (Display*) wxGetDisplay(); #endif - /* MATTHEW: [4] Use wxGetMainColormap */ - if (!XParseColor(display, (Colormap) wxTheApp->GetMainColormap((WXDisplay*) display), colour,&xcolour)) + 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 = new wxColour(r, g, b); - Append(colour, col); + AddColour(colour, col); return col; #endif // __X__ @@ -393,37 +425,32 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour) wxString wxColourDatabase::FindName (const wxColour& colour) const { - wxString name; - unsigned char red = colour.Red (); unsigned char green = colour.Green (); unsigned char blue = colour.Blue (); - for (wxNode * node = First (); node; node = node->Next ()) + typedef wxStringToColourHashMap::iterator iterator; + + for (iterator it = m_map->begin(), en = m_map->end(); it != en; ++it ) { - wxColour *col = (wxColour *) node->Data (); + wxColour *col = it->second; if (col->Red () == red && col->Green () == green && col->Blue () == blue) - { - const wxChar *found = node->GetKeyString(); - if ( found ) - { - name = found; - - break; - } - } + return it->first; } - return name; + return wxEmptyString; } void wxInitializeStockLists() { - wxTheBrushList = new wxBrushList; - wxThePenList = new wxPenList; - wxTheFontList = new wxFontList; - wxTheBitmapList = new wxBitmapList; + wxTheColourDatabase = new wxColourDatabase; + wxTheColourDatabase->Initialize(); + + wxTheBrushList = new wxBrushList; + wxThePenList = new wxPenList; + wxTheFontList = new wxFontList; + wxTheBitmapList = new wxBitmapList; } void wxInitializeStockObjects () @@ -442,17 +469,42 @@ void wxInitializeStockObjects () #else #endif */ -#if defined(__WXPM__) || defined(__WXMAC__) +#if defined(__WXMAC__) + int sizeFont = 12; + + Str255 fontName ; + SInt16 fontSize ; + Style fontStyle ; + + GetThemeFont(kThemeSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ; + sizeFont = fontSize ; + wxSWISS_FONT = new wxFont (fontSize, wxSWISS, wxNORMAL, wxNORMAL , false , wxMacMakeStringFromPascal(fontName) ); +#elif defined(__WXPM__) static const int sizeFont = 12; - wxNORMAL_FONT = new wxFont (sizeFont, wxMODERN, wxNORMAL, wxNORMAL); #else - wxNORMAL_FONT = new wxFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT)); + wxNORMAL_FONT = new wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); static const int sizeFont = wxNORMAL_FONT->GetPointSize(); #endif +#if defined(__WXPM__) + /* + // Basic OS/2 has a fairly limited number of fonts and these are as good + // as I can do to get something that looks halfway "wx" normal + */ + wxNORMAL_FONT = new wxFont (sizeFont, wxMODERN, wxNORMAL, wxBOLD); + wxSMALL_FONT = new wxFont (sizeFont - 4, wxSWISS, wxNORMAL, wxNORMAL); /* Helv */ + 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); + 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 ) ); +#else wxSMALL_FONT = new wxFont (sizeFont - 2, wxSWISS, wxNORMAL, wxNORMAL); wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL); wxSWISS_FONT = new wxFont (sizeFont, wxSWISS, wxNORMAL, wxNORMAL); +#endif wxRED_PEN = new wxPen (wxT("RED"), 1, wxSOLID); wxCYAN_PEN = new wxPen (wxT("CYAN"), 1, wxSOLID); @@ -549,11 +601,11 @@ wxBitmapList::wxBitmapList() wxBitmapList::~wxBitmapList () { - wxNode *node = First (); + wxList::compatibility_iterator node = GetFirst (); while (node) { - wxBitmap *bitmap = (wxBitmap *) node->Data (); - wxNode *next = node->Next (); + wxBitmap *bitmap = (wxBitmap *) node->GetData (); + wxList::compatibility_iterator next = node->GetNext (); if (bitmap->GetVisible()) delete bitmap; node = next; @@ -563,11 +615,11 @@ wxBitmapList::~wxBitmapList () // Pen and Brush lists wxPenList::~wxPenList () { - wxNode *node = First (); + wxList::compatibility_iterator node = GetFirst (); while (node) { - wxPen *pen = (wxPen *) node->Data (); - wxNode *next = node->Next (); + wxPen *pen = (wxPen *) node->GetData (); + wxList::compatibility_iterator next = node->GetNext (); if (pen->GetVisible()) delete pen; node = next; @@ -586,9 +638,9 @@ void wxPenList::RemovePen (wxPen * pen) wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, int width, int style) { - for (wxNode * node = First (); node; node = node->Next ()) + for (wxList::compatibility_iterator node = GetFirst (); node; node = node->GetNext ()) { - wxPen *each_pen = (wxPen *) node->Data (); + wxPen *each_pen = (wxPen *) node->GetData (); if (each_pen && each_pen->GetVisible() && each_pen->GetWidth () == width && @@ -618,12 +670,12 @@ wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, int width, int style) wxBrushList::~wxBrushList () { - wxNode *node = First (); + wxList::compatibility_iterator node = GetFirst (); while (node) { - wxBrush *brush = (wxBrush *) node->Data (); - wxNode *next = node->Next (); - if (brush->GetVisible()) + wxBrush *brush = (wxBrush *) node->GetData (); + wxList::compatibility_iterator next = node->GetNext (); + if (brush && brush->GetVisible()) delete brush; node = next; } @@ -636,9 +688,9 @@ void wxBrushList::AddBrush (wxBrush * brush) wxBrush *wxBrushList::FindOrCreateBrush (const wxColour& colour, int style) { - for (wxNode * node = First (); node; node = node->Next ()) + for (wxList::compatibility_iterator node = GetFirst (); node; node = node->GetNext ()) { - wxBrush *each_brush = (wxBrush *) node->Data (); + wxBrush *each_brush = (wxBrush *) node->GetData (); if (each_brush && each_brush->GetVisible() && each_brush->GetStyle () == style && @@ -673,15 +725,15 @@ void wxBrushList::RemoveBrush (wxBrush * brush) wxFontList::~wxFontList () { - wxNode *node = First (); + 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->Data (); - wxNode *next = node->Next (); + wxFont *font = (wxFont *) node->GetData (); + wxList::compatibility_iterator next = node->GetNext (); if (font->GetVisible()) delete font; node = next; @@ -707,10 +759,10 @@ wxFont *wxFontList::FindOrCreateFont(int pointSize, wxFontEncoding encoding) { wxFont *font = (wxFont *)NULL; - wxNode *node; - for ( node = First(); node; node = node->Next() ) + wxList::compatibility_iterator node; + for ( node = GetFirst(); node; node = node->GetNext() ) { - font = (wxFont *)node->Data(); + font = (wxFont *)node->GetData(); if ( font->GetVisible() && font->Ok() && font->GetPointSize () == pointSize && @@ -805,12 +857,12 @@ wxSize wxGetDisplaySizeMM() wxResourceCache::~wxResourceCache () { - wxNode *node = First (); + wxList::compatibility_iterator node = GetFirst (); while (node) { - wxObject *item = (wxObject *)node->Data(); + wxObject *item = (wxObject *)node->GetData(); delete item; - node = node->Next (); + node = node->GetNext (); } }