Don't crash on malformed HTML in wxHTML font tag handler.

[wxWidgets.git] / src / common / gdicmn.cpp

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index 2624cdbcca96139b12077f8814f611e1323f4c27..e87361656b39dcdfac7d7c6a72f2077f2bba0ee5 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -1,603 +1,920 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        gdicmn.cpp
+// Name:        src/common/gdicmn.cpp

 // Purpose:     Common GDI classes
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Purpose:     Common GDI classes
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "gdicmn.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #include "wx/gdicmn.h"
 #endif
 
 #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 <string.h>
-
-#ifdef __WINDOWS__
-#include <windows.h>
+#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"
+    #include "wx/math.h"

 #endif
 
 #endif
 

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxRect, wxObject)
-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(wxPoint, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxRealPoint, wxObject)
+
+IMPLEMENT_ABSTRACT_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
 #endif

+WXDLLIMPEXP_DATA_CORE(wxIconBundle) wxNullIconBundle;
+
+const wxSize wxDefaultSize(wxDefaultCoord, wxDefaultCoord);
+const wxPoint wxDefaultPosition(wxDefaultCoord, wxDefaultCoord);
+
+#include "wx/listimpl.cpp"
+WX_DEFINE_LIST(wxPointList)
+

 
 

-wxRect::wxRect(void)
+#if wxUSE_EXTENDED_RTTI
+
+// wxPoint
+
+template<> void wxStringReadValue(const wxString &s , wxPoint &data )

 {
 {

-    x = 0; y = 0; width = 0; height = 0;
+    wxSscanf(s, wxT("%d,%d"), &data.x , &data.y ) ;

 }
 
 }
 

-wxRect::wxRect(long xx, long yy, long w, long h)
+template<> void wxStringWriteValue(wxString &s , const wxPoint &data )

 {
 {

-    x = xx; y = yy; width = w; height = h;
+    s = wxString::Format(wxT("%d,%d"), data.x , data.y ) ;

 }
 
 }
 

-wxRect::wxRect(const wxPoint& topLeft, const wxPoint& bottomRight)
+wxCUSTOM_TYPE_INFO(wxPoint, wxToStringConverter<wxPoint> , wxFromStringConverter<wxPoint>)
+
+template<> void wxStringReadValue(const wxString &s , wxSize &data )

 {
 {

-  x = topLeft.x;
-  y = topLeft.y;
-  width = bottomRight.x - topLeft.x;
-  height = bottomRight.y - topLeft.y;
-  
-  if (width < 0)
-  {
-    width = -width;
-    x -= width;
-  }
-  
-  if (height < 0)
-  {
-    height = -height;
-    x -= height;
-  }
+    wxSscanf(s, wxT("%d,%d"), &data.x , &data.y ) ;

 }
 
 }
 

-wxRect::wxRect(const wxPoint& point, const wxSize& size)
+template<> void wxStringWriteValue(wxString &s , const wxSize &data )

 {
 {

-    x = point.x; y = point.y;
-    width = size.x; height = size.y;
+    s = wxString::Format(wxT("%d,%d"), data.x , data.y ) ;

 }
 
 }
 

-wxRect::wxRect(const wxRect& rect)
+wxCUSTOM_TYPE_INFO(wxSize, wxToStringConverter<wxSize> , wxFromStringConverter<wxSize>)
+
+#endif
+
+wxRect::wxRect(const wxPoint& point1, const wxPoint& point2)

 {
 {

-    x = rect.x; 
-    y = rect.y; 
-    width = rect.width; 
-    height = rect.height;
+    x = point1.x;
+    y = point1.y;
+    width = point2.x - point1.x;
+    height = point2.y - point1.y;
+
+    if (width < 0)
+    {
+        width = -width;
+        x = point2.x;
+    }
+    width++;
+
+    if (height < 0)
+    {
+        height = -height;
+        y = point2.y;
+    }
+    height++;

 }
 
 }
 

-wxRect& wxRect::operator = (const wxRect& rect)
+wxRect& wxRect::Union(const wxRect& rect)

 {
 {

-    x = rect.x; y = rect.y; width = rect.width; height = rect.height;
+    // ignore empty rectangles: union with an empty rectangle shouldn't extend
+    // this one to (0, 0)
+    if ( !width || !height )
+    {
+        *this = rect;
+    }
+    else if ( rect.width && rect.height )
+    {
+        int x1 = wxMin(x, rect.x);
+        int y1 = wxMin(y, rect.y);
+        int y2 = wxMax(y + height, rect.height + rect.y);
+        int x2 = wxMax(x + width, rect.width + rect.x);
+
+        x = x1;
+        y = y1;
+        width = x2 - x1;
+        height = y2 - y1;
+    }
+    //else: we're not empty and rect is empty
+

     return *this;
 }
 
     return *this;
 }
 

-bool wxRect::operator == (const wxRect& rect)
+wxRect& wxRect::Inflate(wxCoord dx, wxCoord dy)

 {
 {

-  return ((x == rect.x) &&
-          (y == rect.y) &&
-          (width == rect.width) &&
-          (height == rect.height));
+     if (-2*dx>width)
+     {
+         // Don't allow deflate to eat more width than we have,
+         // a well-defined rectangle cannot have negative width.
+         x+=width/2;
+         width=0;
+     }
+     else
+     {
+         // The inflate is valid.
+         x-=dx;
+         width+=2*dx;
+     }
+
+     if (-2*dy>height)
+     {
+         // Don't allow deflate to eat more height than we have,
+         // a well-defined rectangle cannot have negative height.
+         y+=height/2;
+         height=0;
+     }
+     else
+     {
+         // The inflate is valid.
+         y-=dy;
+         height+=2*dy;
+     }
+
+    return *this;

 }
 
 }
 

-bool wxRect::operator != (const wxRect& rect)
+bool wxRect::Contains(int cx, int cy) const

 {
 {

-  return ((x != rect.x) ||
-          (y != rect.y) ||
-          (width != rect.width) ||
-          (height != rect.height));
+    return ( (cx >= x) && (cy >= y)
+          && ((cy - y) < height)
+          && ((cx - x) < width)
+          );

 }
 
 }
 

-wxColourDatabase::wxColourDatabase (int type):
-wxList (type)
+bool wxRect::Contains(const wxRect& rect) const

 {
 {

+    return Contains(rect.GetTopLeft()) && Contains(rect.GetBottomRight());

 }
 
 }
 

-wxColourDatabase::~wxColourDatabase (void)
+wxRect& wxRect::Intersect(const wxRect& rect)

 {
 {

-  // Cleanup Colour allocated in Initialize()
-  wxNode *node = First ();
-  while (node)
+    int x2 = GetRight(),
+        y2 = GetBottom();
+
+    if ( x < rect.x )
+        x = rect.x;
+    if ( y < rect.y )
+        y = rect.y;
+    if ( x2 > rect.GetRight() )
+        x2 = rect.GetRight();
+    if ( y2 > rect.GetBottom() )
+        y2 = rect.GetBottom();
+
+    width = x2 - x + 1;
+    height = y2 - y + 1;
+
+    if ( width <= 0 || height <= 0 )

     {
     {

-      wxColour *col = (wxColour *) node->Data ();
-      wxNode *next = node->Next ();
-      delete col;
-      node = next;
+        width =
+        height = 0;

     }
     }

-}

 
 

-// Colour database stuff
-void wxColourDatabase::Initialize (void)
-{
-  // Don't initialize for X: colours are found
-  // in FindColour below.
-  // Added: Not all
-  
-  struct cdef {
-   char *name;
-   int r,g,b;
-  };
-  cdef cc;
-  static cdef table[]={
-  
-#ifdef __WINDOWS__
-   {"AQUAMARINE",112, 219, 147},
-   {"BLACK",0, 0, 0},
-   {"BLUE", 0, 0, 255},
-   {"BLUE VIOLET", 159, 95, 159},
-   {"BROWN", 165, 42, 42},
-   {"CADET BLUE", 95, 159, 159},
-   {"CORAL", 255, 127, 0},
-   {"CORNFLOWER BLUE", 66, 66, 111},
-   {"CYAN", 0, 255, 255},
-   {"DARK GREY", 47, 47, 47},   // ?
-
-   {"DARK GREEN", 47, 79, 47},
-   {"DARK OLIVE GREEN", 79, 79, 47},
-   {"DARK ORCHID", 153, 50, 204},
-   {"DARK SLATE BLUE", 107, 35, 142},
-   {"DARK SLATE GREY", 47, 79, 79},
-   {"DARK TURQUOISE", 112, 147, 219},
-   {"DIM GREY", 84, 84, 84},
-   {"FIREBRICK", 142, 35, 35},
-   {"FOREST GREEN", 35, 142, 35},
-   {"GOLD", 204, 127, 50},
-   {"GOLDENROD", 219, 219, 112},
-   {"GREY", 128, 128, 128},
-   {"GREEN", 0, 255, 0},
-   {"GREEN YELLOW", 147, 219, 112},
-   {"INDIAN RED", 79, 47, 47},
-   {"KHAKI", 159, 159, 95},
-   {"LIGHT BLUE", 191, 216, 216},
-   {"LIGHT GREY", 192, 192, 192},
-   {"LIGHT STEEL BLUE", 143, 143, 188},
-   {"LIME GREEN", 50, 204, 50},
-   {"LIGHT MAGENTA", 255, 0, 255},
-   {"MAGENTA", 255, 0, 255},
-   {"MAROON", 142, 35, 107},
-   {"MEDIUM AQUAMARINE", 50, 204, 153},
-   {"MEDIUM GREY", 100, 100, 100},
-   {"MEDIUM BLUE", 50, 50, 204},
-   {"MEDIUM FOREST GREEN", 107, 142, 35},
-   {"MEDIUM GOLDENROD", 234, 234, 173},
-   {"MEDIUM ORCHID", 147, 112, 219},
-   {"MEDIUM SEA GREEN", 66, 111, 66},
-   {"MEDIUM SLATE BLUE", 127, 0, 255},
-   {"MEDIUM SPRING GREEN", 127, 255, 0},
-   {"MEDIUM TURQUOISE", 112, 219, 219},
-   {"MEDIUM VIOLET RED", 219, 112, 147},
-   {"MIDNIGHT BLUE", 47, 47, 79},
-   {"NAVY", 35, 35, 142},
-   {"ORANGE", 204, 50, 50},
-   {"ORANGE RED", 255, 0, 127},
-   {"ORCHID", 219, 112, 219},
-   {"PALE GREEN", 143, 188, 143},
-   {"PINK", 188, 143, 234},
-   {"PLUM", 234, 173, 234},
-   {"PURPLE", 176, 0, 255},
-   {"RED", 255, 0, 0},
-   {"SALMON", 111, 66, 66},
-   {"SEA GREEN", 35, 142, 107},
-   {"SIENNA", 142, 107, 35},
-   {"SKY BLUE", 50, 153, 204},
-   {"SLATE BLUE", 0, 127, 255},
-   {"SPRING GREEN", 0, 255, 127},
-   {"STEEL BLUE", 35, 107, 142},
-   {"TAN", 219, 147, 112},
-   {"THISTLE", 216, 191, 216},
-   {"TURQUOISE", 173, 234, 234},
-   {"VIOLET", 79, 47, 79},
-   {"VIOLET RED", 204, 50, 153},
-   {"WHEAT", 216, 216, 191},
-   {"WHITE", 255, 255, 255},
-   {"YELLOW", 255, 255, 0},
-   {"YELLOW GREEN", 153, 204, 50},
-#endif
+    return *this;
+}

 
 

-#if defined(__GTK__) || defined(__X__)
-   {"MEDIUM GOLDENROD", 234, 234, 173},
-   {"MEDIUM FOREST GREEN", 107, 142, 35},
-   {"LIGHT MAGENTA", 255, 0, 255},
-   {"MEDIUM GREY", 100, 100, 100},
-#endif
-   
-   {0,0,0,0}
-  };
-  int i;
-  for (i=0;cc=table[i],cc.name!=0;i++)
-  {
-    Append(cc.name,new wxColour(cc.r,cc.g,cc.b));
-  }
-
-}
-
-/*
- * 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)
-{
-  wxNode *node = Find((char *) (const char *)colour);
-  if (node)
-    return (wxColour *)node->Data();
-    
-#ifdef __WINDOWS__
-  else return NULL;
-#endif
+bool wxRect::Intersects(const wxRect& rect) const
+{
+    wxRect r = Intersect(rect);

 
 

-#ifdef __GTK__
-  else {
-    wxColour *col = new wxColour( colour );
-    
-    if (!(col->Ok())) {
-      delete col;
-      return NULL;
-    }
-    Append( colour, col );
-    return col;
-  }
-#endif
+    // if there is no intersection, both width and height are 0
+    return r.width != 0;
+}

 
 

-#ifdef __X__
-  else {
-    XColor xcolour;
+wxRect& wxRect::operator+=(const wxRect& rect)
+{
+    *this = *this + rect;
+    return *this;
+}

 
 

-#ifdef __MOTIF__
-    Display *display = XtDisplay(wxTheApp->topLevel) ;
-#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);
-#endif

 
 

-    /* MATTHEW: [4] Use wxGetMainColormap */
-    if (!XParseColor(display, wxGetMainColormap(display), colour,&xcolour))
-      return NULL;
+wxRect& wxRect::operator*=(const wxRect& rect)
+{
+    *this = *this * rect;
+    return *this;
+}

 
 

-    unsigned char r = (unsigned char)(xcolour.red >> 8);
-    unsigned char g = (unsigned char)(xcolour.green >> 8);
-    unsigned char b = (unsigned char)(xcolour.blue >> 8);

 
 

-    wxColour *col = new wxColour(r, g, b);
-    Append(colour, col);
+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);
+}

 
 

-    return col;
-  }
-#endif
+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);

 }
 
 }
 

-wxString wxColourDatabase::FindName (const wxColour& colour) const
+wxRealPoint::wxRealPoint(const wxPoint& pt)
+ : x(pt.x), y(pt.y)

 {
 {

-  unsigned char red = colour.Red ();
-  unsigned char green = colour.Green ();
-  unsigned char blue = colour.Blue ();
+}

 
 

-  for (wxNode * node = First (); node; node = node->Next ())
-  {
-      wxColour *col = (wxColour *) node->Data ();
-      if (col->Red () == red && col->Green () == green && col->Blue () == blue)
-       {
-         char *found = node->key.string;
-         if (found)
-           return wxString(found);
-       }
-  }
-  return wxString("");                 // Not Found
+// ============================================================================
+// wxColourDatabase
+// ============================================================================

 
 

+// ----------------------------------------------------------------------------
+// wxColourDatabase ctor/dtor
+// ----------------------------------------------------------------------------
+
+wxColourDatabase::wxColourDatabase ()
+{
+    // will be created on demand in Initialize()
+    m_map = NULL;

 }
 
 }
 

-void 
-wxInitializeStockObjects (void)
+wxColourDatabase::~wxColourDatabase ()

 {
 {

-  wxTheBrushList = new wxBrushList;
-  wxThePenList = new wxPenList;
-  wxTheFontList = new wxFontList;
-  wxTheBitmapList = new wxBitmapList;
+    if ( m_map )
+    {
+        WX_CLEAR_HASH_MAP(wxStringToColourHashMap, *m_map);
+
+        delete m_map;
+    }

 
 

-#ifdef __MOTIF__
+#ifdef __WXPM__
+    delete [] m_palTable;

 #endif
 #endif

-#ifdef __X__
-  wxFontPool = new XFontPool;
+}
+
+// Colour database stuff
+void wxColourDatabase::Initialize()
+{
+    if ( m_map )
+    {
+        // already initialized
+        return;
+    }
+
+    m_map = new wxStringToColourHashMap;
+
+    static const struct wxColourDesc
+    {
+        const wxChar *name;
+        unsigned char r,g,b;
+    }
+    wxColourTable[] =
+    {
+        {wxT("AQUAMARINE"),112, 219, 147},
+        {wxT("BLACK"),0, 0, 0},
+        {wxT("BLUE"), 0, 0, 255},
+        {wxT("BLUE VIOLET"), 159, 95, 159},
+        {wxT("BROWN"), 165, 42, 42},
+        {wxT("CADET BLUE"), 95, 159, 159},
+        {wxT("CORAL"), 255, 127, 0},
+        {wxT("CORNFLOWER BLUE"), 66, 66, 111},
+        {wxT("CYAN"), 0, 255, 255},
+        {wxT("DARK GREY"), 47, 47, 47},   // ?
+
+        {wxT("DARK GREEN"), 47, 79, 47},
+        {wxT("DARK OLIVE GREEN"), 79, 79, 47},
+        {wxT("DARK ORCHID"), 153, 50, 204},
+        {wxT("DARK SLATE BLUE"), 107, 35, 142},
+        {wxT("DARK SLATE GREY"), 47, 79, 79},
+        {wxT("DARK TURQUOISE"), 112, 147, 219},
+        {wxT("DIM GREY"), 84, 84, 84},
+        {wxT("FIREBRICK"), 142, 35, 35},
+        {wxT("FOREST GREEN"), 35, 142, 35},
+        {wxT("GOLD"), 204, 127, 50},
+        {wxT("GOLDENROD"), 219, 219, 112},
+        {wxT("GREY"), 128, 128, 128},
+        {wxT("GREEN"), 0, 255, 0},
+        {wxT("GREEN YELLOW"), 147, 219, 112},
+        {wxT("INDIAN RED"), 79, 47, 47},
+        {wxT("KHAKI"), 159, 159, 95},
+        {wxT("LIGHT BLUE"), 191, 216, 216},
+        {wxT("LIGHT GREY"), 192, 192, 192},
+        {wxT("LIGHT STEEL BLUE"), 143, 143, 188},
+        {wxT("LIME GREEN"), 50, 204, 50},
+        {wxT("LIGHT MAGENTA"), 255, 0, 255},
+        {wxT("MAGENTA"), 255, 0, 255},
+        {wxT("MAROON"), 142, 35, 107},
+        {wxT("MEDIUM AQUAMARINE"), 50, 204, 153},
+        {wxT("MEDIUM GREY"), 100, 100, 100},
+        {wxT("MEDIUM BLUE"), 50, 50, 204},
+        {wxT("MEDIUM FOREST GREEN"), 107, 142, 35},
+        {wxT("MEDIUM GOLDENROD"), 234, 234, 173},
+        {wxT("MEDIUM ORCHID"), 147, 112, 219},
+        {wxT("MEDIUM SEA GREEN"), 66, 111, 66},
+        {wxT("MEDIUM SLATE BLUE"), 127, 0, 255},
+        {wxT("MEDIUM SPRING GREEN"), 127, 255, 0},
+        {wxT("MEDIUM TURQUOISE"), 112, 219, 219},
+        {wxT("MEDIUM VIOLET RED"), 219, 112, 147},
+        {wxT("MIDNIGHT BLUE"), 47, 47, 79},
+        {wxT("NAVY"), 35, 35, 142},
+        {wxT("ORANGE"), 204, 50, 50},
+        {wxT("ORANGE RED"), 255, 0, 127},
+        {wxT("ORCHID"), 219, 112, 219},
+        {wxT("PALE GREEN"), 143, 188, 143},
+        {wxT("PINK"), 255, 192, 203},
+        {wxT("PLUM"), 234, 173, 234},
+        {wxT("PURPLE"), 176, 0, 255},
+        {wxT("RED"), 255, 0, 0},
+        {wxT("SALMON"), 111, 66, 66},
+        {wxT("SEA GREEN"), 35, 142, 107},
+        {wxT("SIENNA"), 142, 107, 35},
+        {wxT("SKY BLUE"), 50, 153, 204},
+        {wxT("SLATE BLUE"), 0, 127, 255},
+        {wxT("SPRING GREEN"), 0, 255, 127},
+        {wxT("STEEL BLUE"), 35, 107, 142},
+        {wxT("TAN"), 219, 147, 112},
+        {wxT("THISTLE"), 216, 191, 216},
+        {wxT("TURQUOISE"), 173, 234, 234},
+        {wxT("VIOLET"), 79, 47, 79},
+        {wxT("VIOLET RED"), 204, 50, 153},
+        {wxT("WHEAT"), 216, 216, 191},
+        {wxT("WHITE"), 255, 255, 255},
+        {wxT("YELLOW"), 255, 255, 0},
+        {wxT("YELLOW GREEN"), 153, 204, 50}
+    };
+
+    size_t n;
+
+    for ( n = 0; n < WXSIZEOF(wxColourTable); n++ )
+    {
+        const wxColourDesc& cc = wxColourTable[n];
+        (*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++ )
+    {
+        const wxColourDesc& cc = wxColourTable[n];
+        m_palTable[n] = OS2RGB(cc.r,cc.g,cc.b);
+    }
+    m_nSize = n;

 #endif
 #endif

+}
+
+// ----------------------------------------------------------------------------
+// wxColourDatabase operations
+// ----------------------------------------------------------------------------
+
+void wxColourDatabase::AddColour(const wxString& name, const wxColour& colour)
+{
+    Initialize();

 
 

-  wxNORMAL_FONT = new wxFont (12, wxMODERN, wxNORMAL, wxNORMAL);
-  wxSMALL_FONT = new wxFont (10, wxSWISS, wxNORMAL, wxNORMAL);
-  wxITALIC_FONT = new wxFont (12, wxROMAN, wxITALIC, wxNORMAL);
-  wxSWISS_FONT = new wxFont (12, wxSWISS, wxNORMAL, wxNORMAL);
-
-  wxRED_PEN = new wxPen ("RED", 1, wxSOLID);
-  wxCYAN_PEN = new wxPen ("CYAN", 1, wxSOLID);
-  wxGREEN_PEN = new wxPen ("GREEN", 1, wxSOLID);
-  wxBLACK_PEN = new wxPen ("BLACK", 1, wxSOLID);
-  wxWHITE_PEN = new wxPen ("WHITE", 1, wxSOLID);
-  wxTRANSPARENT_PEN = new wxPen ("BLACK", 1, wxTRANSPARENT);
-  wxBLACK_DASHED_PEN = new wxPen ("BLACK", 1, wxSHORT_DASH);
-  wxGREY_PEN = new wxPen ("GREY", 1, wxSOLID);
-  wxMEDIUM_GREY_PEN = new wxPen ("MEDIUM GREY", 1, wxSOLID);
-  wxLIGHT_GREY_PEN = new wxPen ("LIGHT GREY", 1, wxSOLID);
-
-  wxBLUE_BRUSH = new wxBrush ("BLUE", wxSOLID);
-  wxGREEN_BRUSH = new wxBrush ("GREEN", wxSOLID);
-  wxWHITE_BRUSH = new wxBrush ("WHITE", wxSOLID);
-  wxBLACK_BRUSH = new wxBrush ("BLACK", wxSOLID);
-  wxTRANSPARENT_BRUSH = new wxBrush ("BLACK", wxTRANSPARENT);
-  wxCYAN_BRUSH = new wxBrush ("CYAN", wxSOLID);
-  wxRED_BRUSH = new wxBrush ("RED", wxSOLID);
-  wxGREY_BRUSH = new wxBrush ("GREY", wxSOLID);
-  wxMEDIUM_GREY_BRUSH = new wxBrush ("MEDIUM GREY", wxSOLID);
-  wxLIGHT_GREY_BRUSH = new wxBrush ("LIGHT GREY", wxSOLID);
-
-  wxBLACK = new wxColour ("BLACK");
-  wxWHITE = new wxColour ("WHITE");
-  wxRED = new wxColour ("RED");
-  wxBLUE = new wxColour ("BLUE");
-  wxGREEN = new wxColour ("GREEN");
-  wxCYAN = new wxColour ("CYAN");
-  wxLIGHT_GREY = new wxColour ("LIGHT GREY");
-
-  wxSTANDARD_CURSOR = new wxCursor (wxCURSOR_ARROW);
-  wxHOURGLASS_CURSOR = new wxCursor (wxCURSOR_WAIT);
-  wxCROSS_CURSOR = new wxCursor (wxCURSOR_CROSS);
-}
-
-void 
-wxDeleteStockObjects (void)
-{
-  DELETEP(wxNORMAL_FONT);
-  DELETEP(wxSMALL_FONT);
-  DELETEP(wxITALIC_FONT);
-  DELETEP(wxSWISS_FONT);
-
-  DELETEP(wxRED_PEN);
-  DELETEP(wxCYAN_PEN);
-  DELETEP(wxGREEN_PEN);
-  DELETEP(wxBLACK_PEN);
-  DELETEP(wxWHITE_PEN);
-  DELETEP(wxTRANSPARENT_PEN);
-  DELETEP(wxBLACK_DASHED_PEN);
-  DELETEP(wxGREY_PEN);
-  DELETEP(wxMEDIUM_GREY_PEN);
-  DELETEP(wxLIGHT_GREY_PEN);
-
-  DELETEP(wxBLUE_BRUSH);
-  DELETEP(wxGREEN_BRUSH);
-  DELETEP(wxWHITE_BRUSH);
-  DELETEP(wxBLACK_BRUSH);
-  DELETEP(wxTRANSPARENT_BRUSH);
-  DELETEP(wxCYAN_BRUSH);
-  DELETEP(wxRED_BRUSH);
-  DELETEP(wxGREY_BRUSH);
-  DELETEP(wxMEDIUM_GREY_BRUSH);
-  DELETEP(wxLIGHT_GREY_BRUSH);
-
-  DELETEP(wxBLACK);
-  DELETEP(wxWHITE);
-  DELETEP(wxRED);
-  DELETEP(wxBLUE);
-  DELETEP(wxGREEN);
-  DELETEP(wxCYAN);
-  DELETEP(wxLIGHT_GREY);
-
-  DELETEP(wxSTANDARD_CURSOR);
-  DELETEP(wxHOURGLASS_CURSOR);
-  DELETEP(wxCROSS_CURSOR);
-}
-
-wxBitmapList::wxBitmapList (void)
-{
-}
-
-wxBitmapList::~wxBitmapList (void)
-{
-  wxNode *node = First ();
-  while (node)
+    // canonicalize the colour names before using them as keys: they should be
+    // in upper case
+    wxString colName = name;
+    colName.MakeUpper();
+
+    // ... and we also allow both grey/gray
+    wxString colNameAlt = colName;
+    if ( !colNameAlt.Replace(wxT("GRAY"), wxT("GREY")) )

     {
     {

-      wxBitmap *bitmap = (wxBitmap *) node->Data ();
-      wxNode *next = node->Next ();
-      delete bitmap;
-//      bitmap->FreeResource(TRUE);
-      node = next;
+        // 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() && !colNameAlt.empty() )
+        it = m_map->find(colNameAlt);
+    if ( it != m_map->end() )
+    {
+        *(it->second) = colour;
+    }
+    else // new colour
+    {
+        (*m_map)[colName] = new wxColour(colour);

     }
 }
 
     }
 }
 

-// Pen and Brush lists
-wxPenList::~wxPenList (void)
+wxColour wxColourDatabase::Find(const wxString& colour) const

 {
 {

-  wxNode *node = First ();
-  while (node)
+    wxColourDatabase * const self = wxConstCast(this, wxColourDatabase);
+    self->Initialize();
+
+    // make the comparaison case insensitive and also match both grey and gray
+    wxString colName = colour;
+    colName.MakeUpper();
+    wxString colNameAlt = colName;
+    if ( !colNameAlt.Replace(wxT("GRAY"), wxT("GREY")) )
+        colNameAlt.clear();
+
+    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);
+
+    // 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;
+}
+
+wxString wxColourDatabase::FindName(const wxColour& colour) const
+{
+    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 )

     {
     {

-      wxPen *pen = (wxPen *) node->Data ();
-      wxNode *next = node->Next ();
-      delete pen;
-//      pen->FreeResource(TRUE);
-      node = next;
+        if ( *(it->second) == colour )
+            return it->first;

     }
     }

+
+    return wxEmptyString;

 }
 
 }
 

-void wxPenList::AddPen (wxPen * pen)
+// ----------------------------------------------------------------------------
+// deprecated wxColourDatabase methods
+// ----------------------------------------------------------------------------
+
+#if WXWIN_COMPATIBILITY_2_6
+wxColour *wxColourDatabase::FindColour(const wxString& name)

 {
 {

-  Append (pen);
+    // 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);

 }
 }

+#endif // WXWIN_COMPATIBILITY_2_6
+
+// ============================================================================
+// stock objects
+// ============================================================================

 
 

-void wxPenList::RemovePen (wxPen * pen)
+static wxStockGDI gs_wxStockGDI_instance;
+wxStockGDI* wxStockGDI::ms_instance = &gs_wxStockGDI_instance;
+wxObject* wxStockGDI::ms_stockObject[ITEMCOUNT];
+
+wxStockGDI::wxStockGDI()

 {
 {

-  DeleteObject (pen);

 }
 
 }
 

-wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, int width, int style)
+wxStockGDI::~wxStockGDI()

 {
 {

-  for (wxNode * node = First (); node; node = node->Next ())
+}
+
+void wxStockGDI::DeleteAll()
+{
+    for (unsigned i = 0; i < ITEMCOUNT; i++)

     {
     {

-      wxPen *each_pen = (wxPen *) node->Data ();
-      if (each_pen && each_pen->GetVisible() &&
-         each_pen->GetWidth () == width &&
-         each_pen->GetStyle () == style &&
-         each_pen->GetColour ().Red () == colour.Red () &&
-         each_pen->GetColour ().Green () == colour.Green () &&
-         each_pen->GetColour ().Blue () == colour.Blue ())
-       return each_pen;
+        wxDELETE(ms_stockObject[i]);

     }
     }

-  wxPen *pen = new wxPen (colour, width, style);
+}

 
 

-  // Yes, we can return a pointer to this in a later FindOrCreatePen call,
-  // because we created it within FindOrCreatePen. Safeguards against
-  // returning a pointer to an automatic variable and hanging on to it
-  // (dangling pointer).
-  pen->SetVisible(TRUE);
-  return pen;
+const wxBrush* wxStockGDI::GetBrush(Item item)
+{
+    wxBrush* brush = static_cast<wxBrush*>(ms_stockObject[item]);
+    if (brush == NULL)
+    {
+        switch (item)
+        {
+        case BRUSH_BLACK:
+            brush = new wxBrush(*GetColour(COLOUR_BLACK), wxBRUSHSTYLE_SOLID);
+            break;
+        case BRUSH_BLUE:
+            brush = new wxBrush(*GetColour(COLOUR_BLUE), wxBRUSHSTYLE_SOLID);
+            break;
+        case BRUSH_CYAN:
+            brush = new wxBrush(*GetColour(COLOUR_CYAN), wxBRUSHSTYLE_SOLID);
+            break;
+        case BRUSH_GREEN:
+            brush = new wxBrush(*GetColour(COLOUR_GREEN), wxBRUSHSTYLE_SOLID);
+            break;
+        case BRUSH_YELLOW:
+            brush = new wxBrush(*GetColour(COLOUR_YELLOW), wxBRUSHSTYLE_SOLID);
+            break;
+        case BRUSH_GREY:
+            brush = new wxBrush(wxColour(wxT("GREY")), wxBRUSHSTYLE_SOLID);
+            break;
+        case BRUSH_LIGHTGREY:
+            brush = new wxBrush(*GetColour(COLOUR_LIGHTGREY), wxBRUSHSTYLE_SOLID);
+            break;
+        case BRUSH_MEDIUMGREY:
+            brush = new wxBrush(wxColour(wxT("MEDIUM GREY")), wxBRUSHSTYLE_SOLID);
+            break;
+        case BRUSH_RED:
+            brush = new wxBrush(*GetColour(COLOUR_RED), wxBRUSHSTYLE_SOLID);
+            break;
+        case BRUSH_TRANSPARENT:
+            brush = new wxBrush(*GetColour(COLOUR_BLACK), wxBRUSHSTYLE_TRANSPARENT);
+            break;
+        case BRUSH_WHITE:
+            brush = new wxBrush(*GetColour(COLOUR_WHITE), wxBRUSHSTYLE_SOLID);
+            break;
+        default:
+            wxFAIL;
+        }
+        ms_stockObject[item] = brush;
+    }
+    return brush;

 }
 
 }
 

-wxPen *wxPenList::FindOrCreatePen (const wxString& colour, int width, int style)
+const wxColour* wxStockGDI::GetColour(Item item)

 {
 {

-  wxColour *the_colour = wxTheColourDatabase->FindColour (colour);
-  if (the_colour)
-    return FindOrCreatePen (*the_colour, width, style);
-  else
-    return NULL;
+    wxColour* colour = static_cast<wxColour*>(ms_stockObject[item]);
+    if (colour == NULL)
+    {
+        switch (item)
+        {
+        case COLOUR_BLACK:
+            colour = new wxColour(0, 0, 0);
+            break;
+        case COLOUR_BLUE:
+            colour = new wxColour(0, 0, 255);
+            break;
+        case COLOUR_CYAN:
+            colour = new wxColour(wxT("CYAN"));
+            break;
+        case COLOUR_GREEN:
+            colour = new wxColour(0, 255, 0);
+            break;
+        case COLOUR_YELLOW:
+            colour = new wxColour(255, 255, 0);
+            break;
+        case COLOUR_LIGHTGREY:
+            colour = new wxColour(wxT("LIGHT GREY"));
+            break;
+        case COLOUR_RED:
+            colour = new wxColour(255, 0, 0);
+            break;
+        case COLOUR_WHITE:
+            colour = new wxColour(255, 255, 255);
+            break;
+        default:
+            wxFAIL;
+        }
+        ms_stockObject[item] = colour;
+    }
+    return colour;

 }
 
 }
 

-wxBrushList::~wxBrushList (void)
+const wxCursor* wxStockGDI::GetCursor(Item item)

 {
 {

-  wxNode *node = First ();
-  while (node)
+    wxCursor* cursor = static_cast<wxCursor*>(ms_stockObject[item]);
+    if (cursor == NULL)

     {
     {

-      wxBrush *brush = (wxBrush *) node->Data ();
-      wxNode *next = node->Next ();
-      delete brush;
-      node = next;
+        switch (item)
+        {
+        case CURSOR_CROSS:
+            cursor = new wxCursor(wxCURSOR_CROSS);
+            break;
+        case CURSOR_HOURGLASS:
+            cursor = new wxCursor(wxCURSOR_WAIT);
+            break;
+        case CURSOR_STANDARD:
+            cursor = new wxCursor(wxCURSOR_ARROW);
+            break;
+        default:
+            wxFAIL;
+        }
+        ms_stockObject[item] = cursor;

     }
     }

+    return cursor;

 }
 
 }
 

-void wxBrushList::AddBrush (wxBrush * brush)
+const wxFont* wxStockGDI::GetFont(Item item)

 {
 {

-  Append (brush);
+    wxFont* font = static_cast<wxFont*>(ms_stockObject[item]);
+    if (font == NULL)
+    {
+        switch (item)
+        {
+        case FONT_ITALIC:
+            font = new wxFont(GetFont(FONT_NORMAL)->GetPointSize(), wxROMAN, wxITALIC, wxNORMAL);
+            break;
+        case FONT_NORMAL:
+            font = new wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
+            break;
+        case FONT_SMALL:
+            font = new wxFont(GetFont(FONT_NORMAL)->GetPointSize() - 2, wxSWISS, wxNORMAL, wxNORMAL);
+            break;
+        case FONT_SWISS:
+            font = new wxFont(GetFont(FONT_NORMAL)->GetPointSize(), wxSWISS, wxNORMAL, wxNORMAL);
+            break;
+        default:
+            wxFAIL;
+        }
+        ms_stockObject[item] = font;
+    }
+    return font;

 }
 
 }
 

-wxBrush *wxBrushList::FindOrCreateBrush (const wxColour& colour, int style)
+const wxPen* wxStockGDI::GetPen(Item item)

 {
 {

-  for (wxNode * node = First (); node; node = node->Next ())
+    wxPen* pen = static_cast<wxPen*>(ms_stockObject[item]);
+    if (pen == NULL)

     {
     {

-      wxBrush *each_brush = (wxBrush *) node->Data ();
-      if (each_brush && each_brush->GetVisible() &&
-         each_brush->GetStyle () == style &&
-         each_brush->GetColour ().Red () == colour.Red () &&
-         each_brush->GetColour ().Green () == colour.Green () &&
-         each_brush->GetColour ().Blue () == colour.Blue ())
-       return each_brush;
+        switch (item)
+        {
+        case PEN_BLACK:
+            pen = new wxPen(*GetColour(COLOUR_BLACK), 1, wxPENSTYLE_SOLID);
+            break;
+        case PEN_BLACKDASHED:
+            pen = new wxPen(*GetColour(COLOUR_BLACK), 1, wxPENSTYLE_SHORT_DASH);
+            break;
+        case PEN_BLUE:
+            pen = new wxPen(*GetColour(COLOUR_BLUE), 1, wxPENSTYLE_SOLID);
+            break;
+        case PEN_CYAN:
+            pen = new wxPen(*GetColour(COLOUR_CYAN), 1, wxPENSTYLE_SOLID);
+            break;
+        case PEN_GREEN:
+            pen = new wxPen(*GetColour(COLOUR_GREEN), 1, wxPENSTYLE_SOLID);
+            break;
+        case PEN_YELLOW:
+            pen = new wxPen(*GetColour(COLOUR_YELLOW), 1, wxPENSTYLE_SOLID);
+            break;
+        case PEN_GREY:
+            pen = new wxPen(wxColour(wxT("GREY")), 1, wxPENSTYLE_SOLID);
+            break;
+        case PEN_LIGHTGREY:
+            pen = new wxPen(*GetColour(COLOUR_LIGHTGREY), 1, wxPENSTYLE_SOLID);
+            break;
+        case PEN_MEDIUMGREY:
+            pen = new wxPen(wxColour(wxT("MEDIUM GREY")), 1, wxPENSTYLE_SOLID);
+            break;
+        case PEN_RED:
+            pen = new wxPen(*GetColour(COLOUR_RED), 1, wxPENSTYLE_SOLID);
+            break;
+        case PEN_TRANSPARENT:
+            pen = new wxPen(*GetColour(COLOUR_BLACK), 1, wxPENSTYLE_TRANSPARENT);
+            break;
+        case PEN_WHITE:
+            pen = new wxPen(*GetColour(COLOUR_WHITE), 1, wxPENSTYLE_SOLID);
+            break;
+        default:
+            wxFAIL;
+        }
+        ms_stockObject[item] = pen;

     }
     }

-  // Yes, we can return a pointer to this in a later FindOrCreateBrush call,
-  // because we created it within FindOrCreateBrush. Safeguards against
-  // returning a pointer to an automatic variable and hanging on to it
-  // (dangling pointer).
-  wxBrush *brush = new wxBrush (colour, style);
-  brush->SetVisible(TRUE);
-  return brush;
+    return pen;

 }
 
 }
 

-wxBrush *wxBrushList::FindOrCreateBrush (const wxString& colour, int style)
+void wxInitializeStockLists()

 {
 {

-  wxColour *the_colour = wxTheColourDatabase->FindColour (colour);
-  if (the_colour)
-    return FindOrCreateBrush (*the_colour, style);
-  else
-    return NULL;
+    wxTheColourDatabase = new wxColourDatabase;
+
+    wxTheBrushList = new wxBrushList;
+    wxThePenList = new wxPenList;
+    wxTheFontList = new wxFontList;

 }
 
 }
 

-void wxBrushList::RemoveBrush (wxBrush * brush)
+void wxDeleteStockLists()
+{
+    wxDELETE(wxTheBrushList);
+    wxDELETE(wxThePenList);
+    wxDELETE(wxTheFontList);
+
+    // wxTheColourDatabase is cleaned up by wxAppBase::CleanUp()
+}
+
+// ============================================================================
+// wxTheXXXList stuff (semi-obsolete)
+// ============================================================================
+
+wxGDIObjListBase::wxGDIObjListBase()

 {
 {

-  DeleteObject (brush);

 }
 
 }
 

-wxFontList::~wxFontList (void)
+wxGDIObjListBase::~wxGDIObjListBase()

 {
 {

-#ifdef __WINDOWS__
-  wxNode *node = First ();
-  while (node)
+    for (wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext())

     {
     {

-/*
-      wxFont *font = (wxFont *) node->Data ();
-      wxNode *next = node->Next ();
-      delete font;
-      node = next;
-*/
-         // New for 2.0: don't delete the font (it may be a member
-         // of a wxDC, for example)
-      wxFont *font = (wxFont *) node->Data ();
-      wxNode *next = node->Next ();
-
-         // Force the font to be deleted
-      font->FreeResource(TRUE);
-      node = next;
+        delete static_cast<wxObject*>(node->GetData());

     }
     }

-#endif

 }
 
 }
 

-void wxFontList::AddFont (wxFont * font)
+wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, int width, wxPenStyle style)

 {
 {

-  Append (font);
+    for ( wxList::compatibility_iterator node = list.GetFirst();
+          node;
+          node = node->GetNext() )
+    {
+        wxPen * const pen = (wxPen *) node->GetData();
+        if ( pen->GetWidth () == width &&
+                pen->GetStyle () == style &&
+                    pen->GetColour() == colour )
+            return pen;
+    }
+
+    wxPen* pen = NULL;
+    wxPen penTmp(colour, width, style);
+    if (penTmp.Ok())
+    {
+        pen = new wxPen(penTmp);
+        list.Append(pen);
+    }
+
+    return pen;

 }
 
 }
 

-void wxFontList::RemoveFont (wxFont * font)
+wxBrush *wxBrushList::FindOrCreateBrush (const wxColour& colour, wxBrushStyle style)

 {
 {

-  DeleteObject (font);
+    for ( wxList::compatibility_iterator node = list.GetFirst();
+          node;
+          node = node->GetNext() )
+    {
+        wxBrush * const brush = (wxBrush *) node->GetData ();
+        if ( brush->GetStyle() == style && brush->GetColour() == colour )
+            return brush;
+    }
+
+    wxBrush* brush = NULL;
+    wxBrush brushTmp(colour, style);
+    if (brushTmp.Ok())
+    {
+        brush = new wxBrush(brushTmp);
+        list.Append(brush);
+    }
+
+    return brush;

 }
 
 }
 

-wxFont *wxFontList::
-       FindOrCreateFont (int PointSize, int FamilyOrFontId, int Style, int Weight, bool underline, const wxString& Face)
+wxFont *wxFontList::FindOrCreateFont(int pointSize,
+                                     wxFontFamily family,
+                                     wxFontStyle style,
+                                     wxFontWeight weight,
+                                     bool underline,
+                                     const wxString& facename,
+                                     wxFontEncoding encoding)

 {
 {

-  for (wxNode * node = First (); node; node = node->Next ())
+    wxFont *font;
+    wxList::compatibility_iterator node;
+    for (node = list.GetFirst(); node; node = node->GetNext())

     {
     {

-      wxFont *each_font = (wxFont *) node->Data ();
-      if (each_font && each_font->GetVisible() && each_font->Ok() &&
-         each_font->GetPointSize () == PointSize &&
-         each_font->GetStyle () == Style &&
-         each_font->GetWeight () == Weight &&
-         each_font->GetUnderlined () == underline &&
-#if defined(__X__) || (defined(__WINDOWS__) && USE_PORTABLE_FONTS_IN_MSW)
-         each_font->GetFontId () == FamilyOrFontId) /* New font system */
-#else
-         each_font->GetFamily () == FamilyOrFontId &&
-          (!each_font->GetFaceName() || each_font->GetFaceName() == Face))
-#endif
-       return each_font;
+        font = (wxFont *)node->GetData();
+        if (
+             font->GetPointSize () == pointSize &&
+             font->GetStyle () == style &&
+             font->GetWeight () == weight &&
+             font->GetUnderlined () == underline )
+        {
+            wxFontFamily fontFamily = (wxFontFamily)font->GetFamily();
+
+#if defined(__WXGTK__)
+            // under GTK the default family is wxSWISS, so looking for a font
+            // with wxDEFAULT family should return a wxSWISS one instead of
+            // creating a new one
+            bool same = (fontFamily == family) ||
+                        (fontFamily == wxFONTFAMILY_SWISS && family == wxFONTFAMILY_DEFAULT);
+#else // !GTK
+            // VZ: but why elsewhere do we require an exact match? mystery...
+            bool same = fontFamily == family;
+#endif // GTK/!GTK
+
+            // empty facename matches anything at all: this is bad because
+            // depending on which fonts are already created, we might get back
+            // a different font if we create it with empty facename, but it is
+            // still better than never matching anything in the cache at all
+            // in this case
+            if ( same && !facename.empty() )
+            {
+                const wxString& fontFace = font->GetFaceName();
+
+                // empty facename matches everything
+                same = !fontFace || fontFace == facename;
+            }
+
+            if ( same && (encoding != wxFONTENCODING_DEFAULT) )
+            {
+                // have to match the encoding too
+                same = font->GetEncoding() == encoding;
+            }
+
+            if ( same )
+            {
+                return font;
+            }
+        }

     }
     }

-  wxFont *font = new wxFont (PointSize, FamilyOrFontId, Style, Weight, underline, Face);
-  font->SetVisible(TRUE);
-  return font;
+
+    // font not found, create the new one
+    font = NULL;
+    wxFont fontTmp(pointSize, family, style, weight, underline, facename, encoding);
+    if (fontTmp.Ok())
+    {
+        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()
+{
+    int x, y;
+    wxDisplaySize(& x, & y);
+    return wxSize(x, y);
+}
+
+wxRect wxGetClientDisplayRect()
+{
+    int x, y, width, height;
+    wxClientDisplayRect(&x, &y, &width, &height);  // call plat-specific version
+    return wxRect(x, y, width, height);
+}
+
+wxSize wxGetDisplaySizeMM()
+{
+    int x, y;
+    wxDisplaySizeMM(& x, & y);
+    return wxSize(x, y);
+}
+
+wxSize wxGetDisplayPPI()
+{
+    const wxSize pixels = wxGetDisplaySize();
+    const wxSize mm = wxGetDisplaySizeMM();
+
+    return wxSize((int)((pixels.x * inches2mm) / mm.x),
+                  (int)((pixels.y * inches2mm) / mm.y));
+}

 
 

+wxResourceCache::~wxResourceCache ()
+{
+    wxList::compatibility_iterator node = GetFirst ();
+    while (node) {
+        wxObject *item = (wxObject *)node->GetData();
+        delete item;
+
+        node = node->GetNext ();
+    }
+}