#include "wx/dc.h"
#include "wx/utils.h"
#include "wx/settings.h"
+#include "wx/hashmap.h"
#include "wx/log.h"
#include <string.h>
#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)
+//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)
IMPLEMENT_ABSTRACT_CLASS(wxDCBase, wxObject)
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 = GetFirst ();
- while (node)
- {
- wxColour *col = (wxColour *) node->GetData ();
- wxNode *next = node->GetNext ();
- delete col;
- node = next;
- }
+ WX_CLEAR_HASH_MAP(wxStringToColourHashMap, *m_map);
+
+ delete m_map;
+ m_map = NULL;
#ifdef __WXPM__
delete [] m_palTable;
#endif
{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;
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];
*/
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
if ( !colName2.Replace(_T("GRAY"), _T("GREY")) )
colName2.clear();
- wxNode *node = GetFirst();
- while ( node )
- {
- const wxChar *key = node->GetKeyString();
- if ( colName == key || colName2 == key )
- {
- return (wxColour *)node->GetData();
- }
+ 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->GetNext();
- }
+ if ( !add )
+ return NULL;
#ifdef __WXMSW__
return NULL;
#ifdef __WXMAC__
return NULL;
#endif
+#ifdef __WXCOCOA__
+ return NULL;
+#endif
#ifdef __WXSTUBS__
return NULL;
#endif
delete col;
return (wxColour *) NULL;
}
- Append( colour, col );
+ AddColour(colour, col);
return col;
#endif
#endif
wxColour *col = new wxColour(r, g, b);
- Append(colour, col);
+ AddColour(colour, col);
return col;
#endif // __X__
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 = GetFirst (); node; node = node->GetNext ())
+ typedef wxStringToColourHashMap::iterator iterator;
+
+ for (iterator it = m_map->begin(), en = m_map->end(); it != en; ++it )
{
- wxColour *col = (wxColour *) node->GetData ();
+ 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 ()
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;
// 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;
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 &&
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;
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 &&
wxFontList::~wxFontList ()
{
- wxNode *node = GetFirst ();
+ wxList::compatibility_iterator node = GetFirst ();
while (node)
{
// Only delete objects that are 'visible', i.e.
// 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;
wxFontEncoding encoding)
{
wxFont *font = (wxFont *)NULL;
- wxNode *node;
+ wxList::compatibility_iterator node;
for ( node = GetFirst(); node; node = node->GetNext() )
{
font = (wxFont *)node->GetData();
wxResourceCache::~wxResourceCache ()
{
- wxNode *node = GetFirst ();
+ wxList::compatibility_iterator node = GetFirst ();
while (node) {
wxObject *item = (wxObject *)node->GetData();
delete item;
projects / wxWidgets.git / blobdiff