Hardware defines spec.

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

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index fa54d946b12852df015672e0e8df493aa30f1caf..27236ce40aa5d0b2533aafee0f73b989cb4f23c3 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -5,14 +5,18 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

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

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "gdicmn.h"
 #endif
 
 #pragma implementation "gdicmn.h"
 #endif
 

+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#endif
+

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


@@ -30,60 +34,89 @@
 #include "wx/font.h"
 #include "wx/palette.h"
 #include "wx/app.h"
 #include "wx/font.h"
 #include "wx/palette.h"
 #include "wx/app.h"

+#include "wx/dc.h"
+#include "wx/utils.h"
+#include "wx/settings.h"
+#include "wx/hashmap.h"

 
 #include "wx/log.h"
 #include <string.h>
 
 #ifdef __WXMSW__
 
 #include "wx/log.h"
 #include <string.h>
 
 #ifdef __WXMSW__

-#include <windows.h>
+#include "wx/msw/wrapwin.h"

 #endif
 
 #ifdef __WXMOTIF__
 #endif
 
 #ifdef __WXMOTIF__

+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif

 #include <Xm/Xm.h>
 #include <Xm/Xm.h>

+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif

 #endif
 
 #endif
 

-#if !USE_SHARED_LIBRARY
-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_DYNAMIC_CLASS(wxRect, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxPoint, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxRealPoint, wxObject)
-*/
+#ifdef __WXX11__
+#include "X11/Xlib.h"

 #endif
 
 #endif
 

-wxRect::wxRect()
+#ifdef __WXMAC__
+#include "wx/mac/private.h"
+#include "wx/mac/uma.h"
+#endif
+
+#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 )
+{
+    wxSscanf(s, wxT("%d,%d"), &data.x , &data.y ) ;
+}
+
+template<> void wxStringWriteValue(wxString &s , const wxSize &data )

 {
 {

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

 
 

-  if (width < 0)
-  {
-    width = -width;
-    x -= width;
-  }
+wxCUSTOM_TYPE_INFO(wxSize, wxToStringConverter<wxSize> , wxFromStringConverter<wxSize>)

 
 

-  if (height < 0)
-  {
-    height = -height;
-    y -= height;
-  }
+#endif
+
+IMPLEMENT_ABSTRACT_CLASS(wxDCBase, wxObject)
+
+wxRect::wxRect(const wxPoint& point1, const wxPoint& point2)
+{
+    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(const wxPoint& point, const wxSize& size)
 }
 
 wxRect::wxRect(const wxPoint& point, const wxSize& size)


@@ -92,259 +125,391 @@ wxRect::wxRect(const wxPoint& point, const wxSize& size)
     width = size.x; height = size.y;
 }
 
     width = size.x; height = size.y;
 }
 

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

 {
 {

-    x = rect.x;
-    y = rect.y;
-    width = rect.width;
-    height = rect.height;
+    return ((x == rect.x) &&
+            (y == rect.y) &&
+            (width == rect.width) &&
+            (height == rect.height));

 }
 
 }
 

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

 {
 {

-    x = rect.x; y = rect.y; width = rect.width; height = rect.height;
+    *this = (*this + rect);
+    return ( *this ) ;
+}
+
+wxRect wxRect::operator + (const wxRect& rect) const
+{
+    int x1 = wxMin(this->x, rect.x);
+    int y1 = wxMin(this->y, rect.y);
+    int y2 = wxMax(y+height, rect.height+rect.y);
+    int x2 = wxMax(x+width, rect.width+rect.x);
+    return wxRect(x1, y1, x2-x1, y2-y1);
+}
+
+wxRect& wxRect::Inflate(wxCoord dx, wxCoord dy)
+{
+    x -= dx;
+    y -= dy;
+    width += 2*dx;
+    height += 2*dy;
+
+    // check that we didn't make the rectangle invalid by accident (you almost
+    // never want to have negative coords and never want negative size)
+    if ( x < 0 )
+        x = 0;
+    if ( y < 0 )
+        y = 0;
+
+    // what else can we do?
+    if ( width < 0 )
+        width = 0;
+    if ( height < 0 )
+        height = 0;
+

     return *this;
 }
 
     return *this;
 }
 

-bool wxRect::operator == (const wxRect& rect)
+bool wxRect::Inside(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)
+          );

 }
 
 }
 

-bool wxRect::operator != (const wxRect& rect)
+wxRect& wxRect::Intersect(const wxRect& rect)

 {
 {

-  return ((x != rect.x) ||
-          (y != rect.y) ||
-          (width != rect.width) ||
-          (height != rect.height));
+    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 )
+    {
+        width =
+        height = 0;
+    }
+
+    return *this;

 }
 
 }
 

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

 {
 {

+    wxRect r = Intersect(rect);
+
+    // if there is no intersection, both width and height are 0
+    return r.width != 0;
+}
+
+// ============================================================================
+// wxColourDatabase
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxColourDatabase ctor/dtor
+// ----------------------------------------------------------------------------
+
+wxColourDatabase::wxColourDatabase ()
+{
+    // will be created on demand in Initialize()
+    m_map = NULL;

 }
 
 wxColourDatabase::~wxColourDatabase ()
 {
 }
 
 wxColourDatabase::~wxColourDatabase ()
 {

-  // Cleanup Colour allocated in Initialize()
-  wxNode *node = First ();
-  while (node)
+    if ( m_map )

     {
     {

-      wxColour *col = (wxColour *) node->Data ();
-      wxNode *next = node->Next ();
-      delete col;
-      node = next;
+        WX_CLEAR_HASH_MAP(wxStringToColourHashMap, *m_map);
+
+        delete m_map;

     }
     }

+
+#ifdef __WXPM__
+    delete [] m_palTable;
+#endif

 }
 
 // Colour database stuff
 }
 
 // Colour database stuff

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

 
 

-#if defined(__WXGTK__) || defined(__X__)
-   {_T("MEDIUM GOLDENROD"), 234, 234, 173},
-   {_T("MEDIUM FOREST GREEN"), 107, 142, 35},
-   {_T("LIGHT MAGENTA"), 255, 0, 255},
-   {_T("MEDIUM GREY"), 100, 100, 100},
-#endif
+    m_map = new wxStringToColourHashMap;

 
 

-   {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));
-  }
+    static const struct wxColourDesc
+    {
+        const wxChar *name;
+        int 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"), 188, 143, 234},
+        {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

 }
 
 }
 

-/*
- * 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.
- */
+// ----------------------------------------------------------------------------
+// wxColourDatabase operations
+// ----------------------------------------------------------------------------

 
 

-wxColour *wxColourDatabase::FindColour(const wxString& colour)
+void wxColourDatabase::AddColour(const wxString& name, const wxColour& colour)

 {
 {

-  // VZ: make the comparaison case insensitive
-  wxString str = colour;
-  str.MakeUpper();
+    Initialize();

 
 

-  wxNode *node = Find(str);
-  if (node)
-    return (wxColour *)node->Data();
+    // canonicalize the colour names before using them as keys: they should be
+    // in upper case
+    wxString colName = name;
+    colName.MakeUpper();

 
 

-#ifdef __WXMSW__
-  else return NULL;
-#endif
+    // ... 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();
+    }

 
 

-// TODO for other implementations. This should really go into
-// platform-specific directories.
-#ifdef __WXMAC__
-  else return NULL;
-#endif
-#ifdef __WXSTUBS__
-  else return NULL;
-#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() )
+    {
+        *(it->second) = colour;
+    }
+    else // new colour
+    {
+        (*m_map)[name] = new wxColour(colour);
+    }
+}
+
+wxColour wxColourDatabase::Find(const wxString& colour) const
+{
+    wxColourDatabase * const self = wxConstCast(this, wxColourDatabase);
+    self->Initialize();
+
+    // first look among the existing colours

 
 

-#ifdef __WXGTK__
-  else {
-    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;
+    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);
+
+    // 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);

     }
     }

-    Append( colour, col );
-    return col;
-  }
-#endif

 
 

-#ifdef __X__
-  else {
+    return col;
+#elif defined(__X__)
+    // TODO: move this to wxColour::CreateByName()

     XColor xcolour;
 
 #ifdef __WXMOTIF__
     Display *display = XtDisplay((Widget) wxTheApp->GetTopLevelWidget()) ;
 #endif
     XColor xcolour;
 
 #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
 #endif

-

     /* MATTHEW: [4] Use wxGetMainColormap */
     /* MATTHEW: [4] Use wxGetMainColormap */

-    if (!XParseColor(display, (Colormap) wxTheApp->GetMainColormap((WXDisplay*) display), colour,&xcolour))
-      return NULL;
-
+    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);
     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);
+    wxColour col(r, g, b);
+    AddColour(colour, col);

 
     return col;
 
     return col;

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

 
 

-  for (wxNode * node = First (); node; node = node->Next ())
-  {
-      wxColour *col = (wxColour *) node->Data ();
+    typedef wxStringToColourHashMap::iterator iterator;

 
 

-      if (col->Red () == red && col->Green () == green && col->Blue () == blue)
-        {
-          const wxChar *found = node->GetKeyString();
-          if (found)
-            return wxString(found);
-        }
-  }
-  return wxString("");                        // Not Found
+    for ( iterator it = m_map->begin(), en = m_map->end(); it != en; ++it )
+    {
+        if ( *(it->second) == colour )
+            return it->first;
+    }

 
 

+    return wxEmptyString;

 }
 
 }
 

-void wxInitializeStockLists () {
-  wxTheBrushList = new wxBrushList;
-  wxThePenList = new wxPenList;
-  wxTheFontList = new wxFontList;
-  wxTheBitmapList = new wxBitmapList;
+// ----------------------------------------------------------------------------
+// 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;
+
+    wxTheBrushList = new wxBrushList;
+    wxThePenList = new wxPenList;
+    wxTheFontList = new wxFontList;
+    wxTheBitmapList = new wxBitmapList;

 }
 
 void wxInitializeStockObjects ()
 }
 
 void wxInitializeStockObjects ()


@@ -356,258 +521,377 @@ void wxInitializeStockObjects ()
   //  wxFontPool = new XFontPool;
 #endif
 
   //  wxFontPool = new XFontPool;
 #endif
 

-  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);
+  // why under MSW fonts shouldn't have the standard system size?
+/*
+#ifdef __WXMSW__
+  static const int sizeFont = 10;
+#else
+#endif
+*/
+#if defined(__WXMAC__)
+    // retrieve size of system font for all stock fonts
+    int sizeFont = 12;
+
+    Str255 fontName ;
+    SInt16 fontSize ;
+    Style fontStyle ;
+
+    GetThemeFont(kThemeSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
+    sizeFont = fontSize ;
+#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
+    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__)
+    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);
+    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);
+    wxGREEN_PEN = new wxPen (wxT("GREEN"), 1, wxSOLID);
+    wxBLACK_PEN = new wxPen (wxT("BLACK"), 1, wxSOLID);
+    wxWHITE_PEN = new wxPen (wxT("WHITE"), 1, wxSOLID);
+    wxTRANSPARENT_PEN = new wxPen (wxT("BLACK"), 1, wxTRANSPARENT);
+    wxBLACK_DASHED_PEN = new wxPen (wxT("BLACK"), 1, wxSHORT_DASH);
+    wxGREY_PEN = new wxPen (wxT("GREY"), 1, wxSOLID);
+    wxMEDIUM_GREY_PEN = new wxPen (wxT("MEDIUM GREY"), 1, wxSOLID);
+    wxLIGHT_GREY_PEN = new wxPen (wxT("LIGHT GREY"), 1, wxSOLID);
+
+    wxBLUE_BRUSH = new wxBrush (wxT("BLUE"), wxSOLID);
+    wxGREEN_BRUSH = new wxBrush (wxT("GREEN"), wxSOLID);
+    wxWHITE_BRUSH = new wxBrush (wxT("WHITE"), wxSOLID);
+    wxBLACK_BRUSH = new wxBrush (wxT("BLACK"), wxSOLID);
+    wxTRANSPARENT_BRUSH = new wxBrush (wxT("BLACK"), wxTRANSPARENT);
+    wxCYAN_BRUSH = new wxBrush (wxT("CYAN"), wxSOLID);
+    wxRED_BRUSH = new wxBrush (wxT("RED"), wxSOLID);
+    wxGREY_BRUSH = new wxBrush (wxT("GREY"), wxSOLID);
+    wxMEDIUM_GREY_BRUSH = new wxBrush (wxT("MEDIUM GREY"), wxSOLID);
+    wxLIGHT_GREY_BRUSH = new wxBrush (wxT("LIGHT GREY"), wxSOLID);
+
+    wxBLACK = new wxColour (wxT("BLACK"));
+    wxWHITE = new wxColour (wxT("WHITE"));
+    wxRED = new wxColour (wxT("RED"));
+    wxBLUE = new wxColour (wxT("BLUE"));
+    wxGREEN = new wxColour (wxT("GREEN"));
+    wxCYAN = new wxColour (wxT("CYAN"));
+    wxLIGHT_GREY = new wxColour (wxT("LIGHT GREY"));
+
+    wxSTANDARD_CURSOR = new wxCursor (wxCURSOR_ARROW);
+    wxHOURGLASS_CURSOR = new wxCursor (wxCURSOR_WAIT);
+    wxCROSS_CURSOR = new wxCursor (wxCURSOR_CROSS);

 }
 
 void wxDeleteStockObjects ()
 {
 }
 
 void wxDeleteStockObjects ()
 {

-  wxDELETE(wxNORMAL_FONT);
-  wxDELETE(wxSMALL_FONT);
-  wxDELETE(wxITALIC_FONT);
-  wxDELETE(wxSWISS_FONT);
-
-  wxDELETE(wxRED_PEN);
-  wxDELETE(wxCYAN_PEN);
-  wxDELETE(wxGREEN_PEN);
-  wxDELETE(wxBLACK_PEN);
-  wxDELETE(wxWHITE_PEN);
-  wxDELETE(wxTRANSPARENT_PEN);
-  wxDELETE(wxBLACK_DASHED_PEN);
-  wxDELETE(wxGREY_PEN);
-  wxDELETE(wxMEDIUM_GREY_PEN);
-  wxDELETE(wxLIGHT_GREY_PEN);
-
-  wxDELETE(wxBLUE_BRUSH);
-  wxDELETE(wxGREEN_BRUSH);
-  wxDELETE(wxWHITE_BRUSH);
-  wxDELETE(wxBLACK_BRUSH);
-  wxDELETE(wxTRANSPARENT_BRUSH);
-  wxDELETE(wxCYAN_BRUSH);
-  wxDELETE(wxRED_BRUSH);
-  wxDELETE(wxGREY_BRUSH);
-  wxDELETE(wxMEDIUM_GREY_BRUSH);
-  wxDELETE(wxLIGHT_GREY_BRUSH);
-
-  wxDELETE(wxBLACK);
-  wxDELETE(wxWHITE);
-  wxDELETE(wxRED);
-  wxDELETE(wxBLUE);
-  wxDELETE(wxGREEN);
-  wxDELETE(wxCYAN);
-  wxDELETE(wxLIGHT_GREY);
-
-  wxDELETE(wxSTANDARD_CURSOR);
-  wxDELETE(wxHOURGLASS_CURSOR);
-  wxDELETE(wxCROSS_CURSOR);
-}
-
-void wxDeleteStockLists() {
-  wxDELETE(wxTheBrushList);
-  wxDELETE(wxThePenList);
-  wxDELETE(wxTheFontList);
-  wxDELETE(wxTheBitmapList);
-}
-
-wxBitmapList::wxBitmapList ()
+    wxDELETE(wxNORMAL_FONT);
+    wxDELETE(wxSMALL_FONT);
+    wxDELETE(wxITALIC_FONT);
+    wxDELETE(wxSWISS_FONT);
+
+    wxDELETE(wxRED_PEN);
+    wxDELETE(wxCYAN_PEN);
+    wxDELETE(wxGREEN_PEN);
+    wxDELETE(wxBLACK_PEN);
+    wxDELETE(wxWHITE_PEN);
+    wxDELETE(wxTRANSPARENT_PEN);
+    wxDELETE(wxBLACK_DASHED_PEN);
+    wxDELETE(wxGREY_PEN);
+    wxDELETE(wxMEDIUM_GREY_PEN);
+    wxDELETE(wxLIGHT_GREY_PEN);
+
+    wxDELETE(wxBLUE_BRUSH);
+    wxDELETE(wxGREEN_BRUSH);
+    wxDELETE(wxWHITE_BRUSH);
+    wxDELETE(wxBLACK_BRUSH);
+    wxDELETE(wxTRANSPARENT_BRUSH);
+    wxDELETE(wxCYAN_BRUSH);
+    wxDELETE(wxRED_BRUSH);
+    wxDELETE(wxGREY_BRUSH);
+    wxDELETE(wxMEDIUM_GREY_BRUSH);
+    wxDELETE(wxLIGHT_GREY_BRUSH);
+
+    wxDELETE(wxBLACK);
+    wxDELETE(wxWHITE);
+    wxDELETE(wxRED);
+    wxDELETE(wxBLUE);
+    wxDELETE(wxGREEN);
+    wxDELETE(wxCYAN);
+    wxDELETE(wxLIGHT_GREY);
+
+    wxDELETE(wxSTANDARD_CURSOR);
+    wxDELETE(wxHOURGLASS_CURSOR);
+    wxDELETE(wxCROSS_CURSOR);
+}
+
+void wxDeleteStockLists()
+{
+    wxDELETE(wxTheBrushList);
+    wxDELETE(wxThePenList);
+    wxDELETE(wxTheFontList);
+    wxDELETE(wxTheBitmapList);
+}
+
+// ============================================================================
+// wxTheXXXList stuff (semi-obsolete)
+// ============================================================================
+
+wxBitmapList::wxBitmapList()

 {
 }
 
 wxBitmapList::~wxBitmapList ()
 {
 {
 }
 
 wxBitmapList::~wxBitmapList ()
 {

-#if defined(__WXMSW__) || defined(__WXMOTIF__)
-  wxNode *node = First ();
-  while (node)
+    wxList::compatibility_iterator node = GetFirst ();
+    while (node)

     {
     {

-      wxBitmap *bitmap = (wxBitmap *) node->Data ();
-      wxNode *next = node->Next ();
-      if (bitmap->GetVisible())
-        delete bitmap;
-      node = next;
+        wxBitmap *bitmap = (wxBitmap *) node->GetData ();
+        wxList::compatibility_iterator next = node->GetNext ();
+        if (bitmap->GetVisible())
+            delete bitmap;
+        node = next;

     }
     }

-#endif

 }
 
 // Pen and Brush lists
 wxPenList::~wxPenList ()
 {
 }
 
 // Pen and Brush lists
 wxPenList::~wxPenList ()
 {

-#if defined(__WXMSW__) || defined(__WXMOTIF__)
-  wxNode *node = First ();
-  while (node)
+    wxList::compatibility_iterator node = GetFirst ();
+    while (node)

     {
     {

-      wxPen *pen = (wxPen *) node->Data ();
-      wxNode *next = node->Next ();
-      if (pen->GetVisible())
-        delete pen;
-      node = next;
+        wxPen *pen = (wxPen *) node->GetData ();
+        wxList::compatibility_iterator next = node->GetNext ();
+        if (pen->GetVisible())
+            delete pen;
+        node = next;

     }
     }

-#endif

 }
 
 void wxPenList::AddPen (wxPen * pen)
 {
 }
 
 void wxPenList::AddPen (wxPen * pen)
 {

-  Append (pen);
+    Append (pen);

 }
 
 void wxPenList::RemovePen (wxPen * pen)
 {
 }
 
 void wxPenList::RemovePen (wxPen * pen)
 {

-  DeleteObject (pen);
+    DeleteObject (pen);

 }
 
 wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, int width, int style)
 {
 }
 
 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 ();
-      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;
+        wxPen *each_pen = (wxPen *) node->GetData ();
+        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;

     }
     }

-  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;
+    wxPen *pen = new wxPen (colour, width, style);
+    if ( !pen->Ok() )
+    {
+        // don't save the invalid pens in the list
+        delete pen;
+
+        return NULL;
+    }
+
+    AddPen(pen);
+
+    // we'll delete it ourselves later
+    pen->SetVisible(true);
+
+    return pen;

 }
 
 wxBrushList::~wxBrushList ()
 {
 }
 
 wxBrushList::~wxBrushList ()
 {

-#if defined(__WXMSW__) || defined(__WXMOTIF__)
-  wxNode *node = First ();
-  while (node)
+    wxList::compatibility_iterator node = GetFirst ();
+    while (node)

     {
     {

-      wxBrush *brush = (wxBrush *) node->Data ();
-      wxNode *next = node->Next ();
-      if (brush->GetVisible())
-        delete brush;
-      node = next;
+        wxBrush *brush = (wxBrush *) node->GetData ();
+        wxList::compatibility_iterator next = node->GetNext ();
+        if (brush && brush->GetVisible())
+            delete brush;
+        node = next;

     }
     }

-#endif

 }
 
 void wxBrushList::AddBrush (wxBrush * brush)
 {
 }
 
 void wxBrushList::AddBrush (wxBrush * brush)
 {

-  Append (brush);
+    Append (brush);

 }
 
 wxBrush *wxBrushList::FindOrCreateBrush (const wxColour& colour, int style)
 {
 }
 
 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 ();
-      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;
+        wxBrush *each_brush = (wxBrush *) node->GetData ();
+        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;

     }
     }

-  // 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;
+
+    wxBrush *brush = new wxBrush (colour, style);
+
+    if ( !brush->Ok() )
+    {
+        // don't put the brushes we failed to create into the list
+        delete brush;
+
+        return NULL;
+    }
+
+    AddBrush(brush);
+
+    // we'll delete it ourselves later
+    brush->SetVisible(true);
+
+    return brush;

 }
 
 void wxBrushList::RemoveBrush (wxBrush * brush)
 {
 }
 
 void wxBrushList::RemoveBrush (wxBrush * brush)
 {

-  DeleteObject (brush);
+    DeleteObject (brush);

 }
 
 wxFontList::~wxFontList ()
 {
 }
 
 wxFontList::~wxFontList ()
 {

-  wxNode *node = First ();
-  while (node)
+    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 ();
-          if (font->GetVisible())
-                delete font;
-      node = next;
-}
+        // 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->GetData ();
+        wxList::compatibility_iterator next = node->GetNext ();
+        if (font->GetVisible())
+            delete font;
+        node = next;
+    }

 }
 
 void wxFontList::AddFont (wxFont * font)
 {
 }
 
 void wxFontList::AddFont (wxFont * font)
 {

-  Append (font);
+    Append (font);

 }
 
 void wxFontList::RemoveFont (wxFont * font)
 {
 }
 
 void wxFontList::RemoveFont (wxFont * font)
 {

-  DeleteObject (font);
+    DeleteObject (font);

 }
 
 }
 

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

 {
 {

-  for (wxNode * node = First (); node; node = node->Next ())
+    wxFont *font = (wxFont *)NULL;
+    wxList::compatibility_iterator node;
+    for ( node = 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__)
-          //          each_font->GetFontId () == FamilyOrFontId) /* New font system */
-          //#else
-          each_font->GetFamily () == FamilyOrFontId &&
-          ((each_font->GetFaceName() == _T("")) || each_font->GetFaceName() == Face))
-        //#endif
-        return each_font;
+        font = (wxFont *)node->GetData();
+        if ( font->GetVisible() &&
+             font->Ok() &&
+             font->GetPointSize () == pointSize &&
+             font->GetStyle () == style &&
+             font->GetWeight () == weight &&
+             font->GetUnderlined () == underline )
+        {
+            int fontFamily = 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 == wxSWISS && family == wxDEFAULT);
+#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.IsEmpty() )
+            {
+                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;
+
+    if ( !node )
+    {
+        // font not found, create the new one
+        font = new wxFont(pointSize, family, style, weight,
+                          underline, facename, encoding);
+
+        AddFont(font);
+
+        // and mark it as being cacheable
+        font->SetVisible(true);
+    }
+
+    return font;

 }
 
 void wxBitmapList::AddBitmap(wxBitmap *bitmap)
 }
 
 void wxBitmapList::AddBitmap(wxBitmap *bitmap)


@@ -627,33 +911,28 @@ wxSize wxGetDisplaySize()
     return wxSize(x, y);
 }
 
     return wxSize(x, y);
 }
 

-wxResourceCache::~wxResourceCache ()
+wxRect wxGetClientDisplayRect()

 {
 {

-  wxNode *node = First ();
-  while (node) {
-    wxGDIObject *item = (wxGDIObject *)node->Data();
-    if (item->IsKindOf(CLASSINFO(wxBrush))) {
-      wxBrush *brush = (wxBrush *)item;
-      delete brush;
-    }
+    int x, y, width, height;
+    wxClientDisplayRect(&x, &y, &width, &height);  // call plat-specific version
+    return wxRect(x, y, width, height);
+}

 
 

-    if (item->IsKindOf(CLASSINFO(wxFont))) {
-      wxFont *font = (wxFont *)item;
-      delete font;
-    }
+wxSize wxGetDisplaySizeMM()
+{
+    int x, y;
+    wxDisplaySizeMM(& x, & y);
+    return wxSize(x, y);
+}

 
 

-    if (item->IsKindOf(CLASSINFO(wxBitmap))) {
-      wxBitmap *bitmap = (wxBitmap *)item;
-      delete bitmap;
-    }
+wxResourceCache::~wxResourceCache ()
+{
+    wxList::compatibility_iterator node = GetFirst ();
+    while (node) {
+        wxObject *item = (wxObject *)node->GetData();
+        delete item;

 
 

-    if (item->IsKindOf(CLASSINFO(wxColour))) {
-      wxColour *colour = (wxColour *)item;
-      delete colour;
+        node = node->GetNext ();

     }
     }

-
-    wxNode *next = node->Next ();
-    node = next;
-  }

 }
 
 }