All char, char *, and char arrays changed to use wxChar or wxString. 99% backward...

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

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index 30f08f8560b547238f370c0dd638397940192f77..a9481d6f49b51fd8269cecfcc98153f916ae6353 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -13,6 +13,10 @@
 #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,6 +34,9 @@
 #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/log.h"
 #include <string.h>
 
 #include "wx/log.h"
 #include <string.h>


@@ -39,39 +46,30 @@
 #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_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)
-*/
-#endif
-
-wxRect::wxRect()
-{
-    x = 0; y = 0; width = 0; height = 0;
-}

 
 

-wxRect::wxRect(long xx, long yy, long w, long h)
-{
-    x = xx; y = yy; width = w; height = h;
-}
+IMPLEMENT_ABSTRACT_CLASS(wxDCBase, wxObject)

 
 wxRect::wxRect(const wxPoint& topLeft, const wxPoint& bottomRight)
 {
   x = topLeft.x;
   y = topLeft.y;
 
 wxRect::wxRect(const wxPoint& topLeft, const wxPoint& bottomRight)
 {
   x = topLeft.x;
   y = topLeft.y;

-  width = bottomRight.x - topLeft.x;
-  height = bottomRight.y - topLeft.y;
+  width = bottomRight.x - topLeft.x + 1;
+  height = bottomRight.y - topLeft.y + 1;

 
   if (width < 0)
   {
 
   if (width < 0)
   {


@@ -82,7 +80,7 @@ wxRect::wxRect(const wxPoint& topLeft, const wxPoint& bottomRight)
   if (height < 0)
   {
     height = -height;
   if (height < 0)
   {
     height = -height;

-    x -= height;
+    y -= height;

   }
 }
 
   }
 }
 


@@ -92,38 +90,38 @@ 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;
-    return *this;
+    *this = (*this + rect);
+    return ( *this ) ;

 }
 
 }
 

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

 {
 {

-  return ((x == rect.x) &&
-          (y == rect.y) &&
-          (width == rect.width) &&
-          (height == rect.height));
+    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);

 }
 
 }
 

-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)
+          );

 }
 
 }
 

-wxColourDatabase::wxColourDatabase (int type):
-wxList (type)
+wxColourDatabase::wxColourDatabase (int type) : wxList (type)

 {
 }
 
 {
 }
 


@@ -138,111 +136,114 @@ wxColourDatabase::~wxColourDatabase ()
       delete col;
       node = next;
     }
       delete col;
       node = next;
     }

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

 }
 
 // Colour database stuff
 void wxColourDatabase::Initialize ()
 {
 }
 
 // Colour database stuff
 void wxColourDatabase::Initialize ()
 {

-  // 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 __WXMSW__
-   {"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
-
-#if defined(__WXGTK__) || defined(__X__)
-   {"MEDIUM GOLDENROD", 234, 234, 173},
-   {"MEDIUM FOREST GREEN", 107, 142, 35},
-   {"LIGHT MAGENTA", 255, 0, 255},
-   {"MEDIUM GREY", 100, 100, 100},
+    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},
+        {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},
+    };
+
+    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));
+    }
+#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

-
-   {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));
-  }
-

 }
 
 /*
 }
 
 /*


@@ -256,39 +257,54 @@ void wxColourDatabase::Initialize ()
 
 wxColour *wxColourDatabase::FindColour(const wxString& colour)
 {
 
 wxColour *wxColourDatabase::FindColour(const wxString& colour)
 {

-  // VZ: make the comparaison case insensitive
-  wxString str = colour;
-  str.MakeUpper();
+    // VZ: make the comparaison case insensitive and also match both grey and
+    //     gray
+    wxString colName = colour;
+    colName.MakeUpper();
+    wxString colName2 = colName;
+    if ( !colName2.Replace(_T("GRAY"), _T("GREY")) )
+        colName2.clear();

 
 

-  wxNode *node = Find(str);
-  if (node)
-    return (wxColour *)node->Data();
+    wxNode *node = First();
+    while ( node )
+    {
+        const wxChar *key = node->GetKeyString();
+        if ( colName == key || colName2 == key )
+        {
+            return (wxColour *)node->Data();
+        }
+
+        node = node->Next();
+    }

 
 #ifdef __WXMSW__
 
 #ifdef __WXMSW__

-  else return NULL;
+  return NULL;
+#endif
+#ifdef __WXPM__
+  return NULL;

 #endif
 
 // TODO for other implementations. This should really go into
 // platform-specific directories.
 #endif
 
 // TODO for other implementations. This should really go into
 // platform-specific directories.

+#ifdef __WXMAC__
+  return NULL;
+#endif

 #ifdef __WXSTUBS__
 #ifdef __WXSTUBS__

-  else return NULL;
+  return NULL;

 #endif
 
 #ifdef __WXGTK__
 #endif
 
 #ifdef __WXGTK__

-  else {
-    wxColour *col = new wxColour( colour );
+  wxColour *col = new wxColour( colour );

 
 

-    if (!(col->Ok())) {
+  if (!(col->Ok())) {

       delete col;
       return (wxColour *) NULL;
       delete col;
       return (wxColour *) NULL;

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

   }
   }

+  Append( colour, col );
+  return col;

 #endif
 
 #ifdef __X__
 #endif
 
 #ifdef __X__

-  else {

     XColor xcolour;
 
 #ifdef __WXMOTIF__
     XColor xcolour;
 
 #ifdef __WXMOTIF__


@@ -312,29 +328,34 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour)
     Append(colour, col);
 
     return col;
     Append(colour, col);
 
     return col;

-  }
-#endif
+#endif // __X__

 }
 
 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 ();
+    wxString name;

 
 

-  for (wxNode * node = First (); node; node = node->Next ())
-  {
-      wxColour *col = (wxColour *) node->Data ();
+    unsigned char red = colour.Red ();
+    unsigned char green = colour.Green ();
+    unsigned char blue = colour.Blue ();

 
 

-      if (col->Red () == red && col->Green () == green && col->Blue () == blue)
+    for (wxNode * node = First (); node; node = node->Next ())
+    {
+        wxColour *col = (wxColour *) node->Data ();
+
+        if (col->Red () == red && col->Green () == green && col->Blue () == blue)

         {
         {

-          const char *found = node->GetKeyString();
-          if (found)
-            return wxString(found);
+            const wxChar *found = node->GetKeyString();
+            if ( found )
+            {
+                name = found;
+
+                break;
+            }

         }
         }

-  }
-  return wxString("");                        // Not Found
+    }

 
 

+    return name;

 }
 
 void wxInitializeStockLists () {
 }
 
 void wxInitializeStockLists () {


@@ -353,10 +374,24 @@ 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);
+  // why under MSW fonts shouldn't have the standard system size?
+/*
+#ifdef __WXMSW__
+  static const int sizeFont = 10;
+#else
+#endif
+*/
+#if defined(__WXPM__) || defined(__WXMAC__)
+  static const int sizeFont = 12;
+  wxNORMAL_FONT = new wxFont (sizeFont, wxMODERN, wxNORMAL, wxNORMAL);
+#else
+  wxNORMAL_FONT = new wxFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+  static const int sizeFont = wxNORMAL_FONT->GetPointSize();
+#endif
+
+  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);

 
   wxRED_PEN = new wxPen ("RED", 1, wxSOLID);
   wxCYAN_PEN = new wxPen ("CYAN", 1, wxSOLID);
 
   wxRED_PEN = new wxPen ("RED", 1, wxSOLID);
   wxCYAN_PEN = new wxPen ("CYAN", 1, wxSOLID);


@@ -448,7 +483,6 @@ wxBitmapList::wxBitmapList ()
 
 wxBitmapList::~wxBitmapList ()
 {
 
 wxBitmapList::~wxBitmapList ()
 {

-#if defined(__WXMSW__) || defined(__WXMOTIF__)

   wxNode *node = First ();
   while (node)
     {
   wxNode *node = First ();
   while (node)
     {


@@ -458,13 +492,11 @@ wxBitmapList::~wxBitmapList ()
         delete bitmap;
       node = next;
     }
         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)
     {
   wxNode *node = First ();
   while (node)
     {


@@ -474,7 +506,6 @@ wxPenList::~wxPenList ()
         delete pen;
       node = next;
     }
         delete pen;
       node = next;
     }

-#endif

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


@@ -492,7 +523,8 @@ wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, int width, int style)
   for (wxNode * node = First (); node; node = node->Next ())
     {
       wxPen *each_pen = (wxPen *) node->Data ();
   for (wxNode * node = First (); node; node = node->Next ())
     {
       wxPen *each_pen = (wxPen *) node->Data ();

-      if (each_pen && each_pen->GetVisible() &&
+      if (each_pen &&
+          each_pen->GetVisible() &&

           each_pen->GetWidth () == width &&
           each_pen->GetStyle () == style &&
           each_pen->GetColour ().Red () == colour.Red () &&
           each_pen->GetWidth () == width &&
           each_pen->GetStyle () == style &&
           each_pen->GetColour ().Red () == colour.Red () &&


@@ -507,12 +539,12 @@ wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, int width, int style)
   // returning a pointer to an automatic variable and hanging on to it
   // (dangling pointer).
   pen->SetVisible(TRUE);
   // returning a pointer to an automatic variable and hanging on to it
   // (dangling pointer).
   pen->SetVisible(TRUE);

+

   return pen;
 }
 
 wxBrushList::~wxBrushList ()
 {
   return pen;
 }
 
 wxBrushList::~wxBrushList ()
 {

-#if defined(__WXMSW__) || defined(__WXMOTIF__)

   wxNode *node = First ();
   while (node)
     {
   wxNode *node = First ();
   while (node)
     {


@@ -522,7 +554,6 @@ wxBrushList::~wxBrushList ()
         delete brush;
       node = next;
     }
         delete brush;
       node = next;
     }

-#endif

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


@@ -535,19 +566,23 @@ wxBrush *wxBrushList::FindOrCreateBrush (const wxColour& colour, int style)
   for (wxNode * node = First (); node; node = node->Next ())
     {
       wxBrush *each_brush = (wxBrush *) node->Data ();
   for (wxNode * node = First (); node; node = node->Next ())
     {
       wxBrush *each_brush = (wxBrush *) node->Data ();

-      if (each_brush && each_brush->GetVisible() &&
+      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;
     }
           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);
   // 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);
   brush->SetVisible(TRUE);

+

   return brush;
 }
 
   return brush;
 }
 


@@ -558,19 +593,19 @@ void wxBrushList::RemoveBrush (wxBrush * brush)
 
 wxFontList::~wxFontList ()
 {
 
 wxFontList::~wxFontList ()
 {

-  wxNode *node = First ();
-  while (node)
+    wxNode *node = First ();
+    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->Data ();
+        wxNode *next = node->Next ();
+        if (font->GetVisible())
+            delete font;
+        node = next;
+    }

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


@@ -583,28 +618,76 @@ 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;
+    wxNode *node;
+    for ( node = First(); node; node = node->Next() )

     {
     {

-      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() == "") || each_font->GetFaceName() == Face))
-        //#endif
-        return each_font;
+        font = (wxFont *)node->Data();
+        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 )
+            {
+                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);
+
+        // and mark it as being cacheable
+        font->SetVisible(TRUE);
+    }
+
+    return font;

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


@@ -624,33 +707,21 @@ wxSize wxGetDisplaySize()
     return wxSize(x, y);
 }
 
     return wxSize(x, y);
 }
 

-wxResourceCache::~wxResourceCache ()
+wxSize wxGetDisplaySizeMM()

 {
 {

-  wxNode *node = First ();
-  while (node) {
-    wxGDIObject *item = (wxGDIObject *)node->Data();
-    if (item->IsKindOf(CLASSINFO(wxBrush))) {
-      wxBrush *brush = (wxBrush *)item;
-      delete brush;
-    }
-
-    if (item->IsKindOf(CLASSINFO(wxFont))) {
-      wxFont *font = (wxFont *)item;
-      delete font;
-    }
+    int x, y;
+    wxDisplaySizeMM(& x, & y);
+    return wxSize(x, y);
+}

 
 

-    if (item->IsKindOf(CLASSINFO(wxBitmap))) {
-      wxBitmap *bitmap = (wxBitmap *)item;
-      delete bitmap;
-    }
+wxResourceCache::~wxResourceCache ()
+{
+    wxNode *node = First ();
+    while (node) {
+        wxObject *item = (wxObject *)node->Data();
+        delete item;

 
 

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

     }
     }

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

 }
 
 }