first attempt for full screen implementation

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

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index 09222b21d40f89b02efd4b7830d2f3f9a57123fd..5af91e126a5f65d44cbaa0cd534c35ce7a8039f0 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -5,11 +5,11 @@
 // 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
 


@@ -37,12 +37,13 @@
 #include "wx/dc.h"
 #include "wx/utils.h"
 #include "wx/settings.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__


@@ -63,33 +64,59 @@
 #include "wx/mac/private.h"
 #include "wx/mac/uma.h"
 #endif
 #include "wx/mac/private.h"
 #include "wx/mac/uma.h"
 #endif

-IMPLEMENT_CLASS(wxColourDatabase, wxList)
-IMPLEMENT_DYNAMIC_CLASS(wxFontList, wxList)
-IMPLEMENT_DYNAMIC_CLASS(wxPenList, wxList)
-IMPLEMENT_DYNAMIC_CLASS(wxBrushList, wxList)
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapList, wxList)
-IMPLEMENT_DYNAMIC_CLASS(wxResourceCache, wxList)
+
+#if wxUSE_EXTENDED_RTTI
+
+// wxPoint
+
+template<> void wxStringReadValue(const wxString &s , wxPoint &data )
+{
+       wxSscanf(s, wxT("%d,%d"), &data.x , &data.y ) ;
+}
+
+template<> void wxStringWriteValue(wxString &s , const wxPoint &data )
+{
+       s = wxString::Format(wxT("%d,%d"), data.x , data.y ) ;
+}
+
+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 )
+{
+       s = wxString::Format(wxT("%d,%d"), data.x , data.y ) ;
+}
+
+wxCUSTOM_TYPE_INFO(wxSize, wxToStringConverter<wxSize> , wxFromStringConverter<wxSize>)
+
+#endif

 
 IMPLEMENT_ABSTRACT_CLASS(wxDCBase, wxObject)
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxDCBase, wxObject)
 

-wxRect::wxRect(const wxPoint& topLeft, const wxPoint& bottomRight)
+wxRect::wxRect(const wxPoint& point1, const wxPoint& point2)

 {
 {

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

 
   if (width < 0)
   {
     width = -width;
 
   if (width < 0)
   {
     width = -width;

-    x -= width;
+    x = point2.x;

   }
   }

+  width++;

 
   if (height < 0)
   {
     height = -height;
 
   if (height < 0)
   {
     height = -height;

-    y -= height;
+    y = point2.y;

   }
   }

+  height++;

 }
 
 wxRect::wxRect(const wxPoint& point, const wxSize& size)
 }
 
 wxRect::wxRect(const wxPoint& point, const wxSize& size)


@@ -186,29 +213,45 @@ bool wxRect::Intersects(const wxRect& rect) const
     return r.width != 0;
 }
 
     return r.width != 0;
 }
 

-wxColourDatabase::wxColourDatabase (int type) : wxList (type)
+// ============================================================================
+// 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
 #ifdef __WXPM__
     delete [] m_palTable;
 #endif
 }
 
 // Colour database stuff

-void wxColourDatabase::Initialize ()
+void wxColourDatabase::Initialize()

 {
 {

+    if ( m_map )
+    {
+        // already initialized
+        return;
+    }
+
+    m_map = new wxStringToColourHashMap;
+

     static const struct wxColourDesc
     {
         const wxChar *name;
     static const struct wxColourDesc
     {
         const wxChar *name;


@@ -286,20 +329,17 @@ void wxColourDatabase::Initialize ()
         {wxT("WHEAT"), 216, 216, 191},
         {wxT("WHITE"), 255, 255, 255},
         {wxT("YELLOW"), 255, 255, 0},
         {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},
+        {wxT("YELLOW GREEN"), 153, 204, 50}

     };
 
     };
 

-    size_t      n;
+    size_t n;

 
     for ( n = 0; n < WXSIZEOF(wxColourTable); n++ )
     {
         const wxColourDesc& cc = wxColourTable[n];
 
     for ( n = 0; n < WXSIZEOF(wxColourTable); n++ )
     {
         const wxColourDesc& cc = wxColourTable[n];

-        Append(cc.name, new wxColour(cc.r,cc.g,cc.b));
+        (*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++ )
 #ifdef __WXPM__
     m_palTable = new long[n];
     for ( n = 0; n < WXSIZEOF(wxColourTable); n++ )


@@ -311,69 +351,73 @@ void wxColourDatabase::Initialize ()
 #endif
 }
 
 #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.
- */
-
-wxColour *wxColourDatabase::FindColour(const wxString& colour)
-{
-    // VZ: make the comparaison case insensitive and also match both grey and
-    //     gray
-    wxString colName = colour;
+// ----------------------------------------------------------------------------
+// wxColourDatabase operations
+// ----------------------------------------------------------------------------
+
+void wxColourDatabase::AddColour(const wxString& name, const wxColour& colour)
+{
+    Initialize();
+
+    // canonicalize the colour names before using them as keys: they should be
+    // in upper case
+    wxString colName = name;

     colName.MakeUpper();
     colName.MakeUpper();

-    wxString colName2 = colName;
-    if ( !colName2.Replace(_T("GRAY"), _T("GREY")) )
-        colName2.clear();

 
 

-    wxNode *node = First();
-    while ( node )
+    // ... and we also allow both grey/gray
+    wxString colNameAlt = colName;
+    if ( !colNameAlt.Replace(_T("GRAY"), _T("GREY")) )

     {
     {

-        const wxChar *key = node->GetKeyString();
-        if ( colName == key || colName2 == key )
-        {
-            return (wxColour *)node->Data();
-        }
+        // but in this case it is not necessary so avoid extra search below
+        colNameAlt.clear();
+    }

 
 

-        node = node->Next();
+    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);
+    }
+}

 
 

-#ifdef __WXMSW__
-  return NULL;
-#endif
-#ifdef __WXPM__
-  return NULL;
-#endif
-#ifdef __WXMGL__
-  return NULL;
-#endif
+wxColour wxColourDatabase::Find(const wxString& colour) const
+{
+    wxColourDatabase * const self = wxConstCast(this, wxColourDatabase);
+    self->Initialize();

 
 

-// TODO for other implementations. This should really go into
-// platform-specific directories.
-#ifdef __WXMAC__
-  return NULL;
-#endif
-#ifdef __WXSTUBS__
-  return NULL;
-#endif
+    // first look among the existing colours

 
 

-#ifdef __WXGTK__
-  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;
-  }
-  Append( colour, col );
-  return col;
-#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() )
+        return *(it->second);

 
 

-#ifdef __X__
+    // 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);
+    }
+
+    return col;
+#elif defined(__X__)
+    // TODO: move this to wxColour::CreateByName()

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


@@ -384,7 +428,7 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour)
 #endif
     /* MATTHEW: [4] Use wxGetMainColormap */
     if (!XParseColor(display, (Colormap) wxTheApp->GetMainColormap((WXDisplay*) display), colour.ToAscii() ,&xcolour))
 #endif
     /* MATTHEW: [4] Use wxGetMainColormap */
     if (!XParseColor(display, (Colormap) wxTheApp->GetMainColormap((WXDisplay*) display), colour.ToAscii() ,&xcolour))

-      return NULL;
+        return NULL;

 
 #if wxUSE_NANOX
     unsigned char r = (unsigned char)(xcolour.red);
 
 #if wxUSE_NANOX
     unsigned char r = (unsigned char)(xcolour.red);


@@ -396,46 +440,76 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour)
     unsigned char b = (unsigned char)(xcolour.blue >> 8);
 #endif
 
     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 // __X__
+#else // other platform
+    return wxNullColour;
+#endif // platforms

 }
 
 }
 

-wxString wxColourDatabase::FindName (const wxColour& colour) const
+wxString wxColourDatabase::FindName(const wxColour& colour) const

 {
 {

-    wxString name;
+    wxColourDatabase * const self = wxConstCast(this, wxColourDatabase);
+    self->Initialize();

 
 

-    unsigned char red = colour.Red ();
-    unsigned char green = colour.Green ();
-    unsigned char blue = colour.Blue ();
+    typedef wxStringToColourHashMap::iterator iterator;

 
 

-    for (wxNode * node = First (); node; node = node->Next ())
+    for ( iterator it = m_map->begin(), en = m_map->end(); it != en; ++it )

     {
     {

-        wxColour *col = (wxColour *) node->Data ();
+        if ( *(it->second) == colour )
+            return it->first;
+    }

 
 

-        if (col->Red () == red && col->Green () == green && col->Blue () == blue)
-        {
-            const wxChar *found = node->GetKeyString();
-            if ( found )
-            {
-                name = found;
+    return wxEmptyString;
+}

 
 

-                break;
-            }
-        }
-    }
+// ----------------------------------------------------------------------------
+// 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

 
 

-    return name;
+    static wxColour s_col;
+
+    s_col = Find(name);
+    if ( !s_col.Ok() )
+        return NULL;
+
+    return new wxColour(s_col);

 }
 
 }
 

+// ============================================================================
+// stock objects
+// ============================================================================
+

 void wxInitializeStockLists()
 {
 void wxInitializeStockLists()
 {

-  wxTheBrushList = new wxBrushList;
-  wxThePenList = new wxPenList;
-  wxTheFontList = new wxFontList;
-  wxTheBitmapList = new wxBitmapList;
+    wxTheColourDatabase = new wxColourDatabase;
+
+    wxTheBrushList = new wxBrushList;
+    wxThePenList = new wxPenList;
+    wxTheFontList = new wxFontList;
+    wxTheBitmapList = new wxBitmapList;

 }
 
 void wxInitializeStockObjects ()
 }
 
 void wxInitializeStockObjects ()


@@ -455,6 +529,7 @@ void wxInitializeStockObjects ()
 #endif
 */
 #if defined(__WXMAC__)
 #endif
 */
 #if defined(__WXMAC__)

+    // retrieve size of system font for all stock fonts

     int sizeFont = 12;
 
     Str255 fontName ;
     int sizeFont = 12;
 
     Str255 fontName ;


@@ -463,8 +538,12 @@ void wxInitializeStockObjects ()
 
        GetThemeFont(kThemeSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
        sizeFont = fontSize ;
 
        GetThemeFont(kThemeSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
        sizeFont = fontSize ;

-    p2cstrcpy( (char*) fontName , fontName ) ;
-    wxSWISS_FONT = new wxFont (fontSize, wxSWISS, wxNORMAL, wxNORMAL , false , fontName );
+#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
 #elif defined(__WXPM__)
   static const int sizeFont = 12;
 #else


@@ -482,11 +561,15 @@ void wxInitializeStockObjects ()
   wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL);
   wxSWISS_FONT = new wxFont (sizeFont, wxSWISS, wxNORMAL, wxNORMAL); /* Helv */
 #elif defined(__WXMAC__)
   wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL);
   wxSWISS_FONT = new wxFont (sizeFont, wxSWISS, wxNORMAL, wxNORMAL); /* Helv */
 #elif defined(__WXMAC__)

-    wxNORMAL_FONT = new wxFont (sizeFont, wxMODERN, wxNORMAL, wxNORMAL);
+    wxSWISS_FONT = new wxFont (sizeFont, wxSWISS, wxNORMAL, wxNORMAL); /* Helv */

     wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL);
     wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL);

+#if __WXMAC_CLASSIC__

        GetThemeFont(kThemeSmallSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
        GetThemeFont(kThemeSmallSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;

-    p2cstrcpy( (char*) fontName , fontName ) ;
-    wxSMALL_FONT = new wxFont (fontSize, wxSWISS, wxNORMAL, wxNORMAL , false , fontName );
+    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);
 #else
   wxSMALL_FONT = new wxFont (sizeFont - 2, wxSWISS, wxNORMAL, wxNORMAL);
   wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL);


@@ -588,11 +671,11 @@ wxBitmapList::wxBitmapList()
 
 wxBitmapList::~wxBitmapList ()
 {
 
 wxBitmapList::~wxBitmapList ()
 {

-  wxNode *node = First ();
+  wxList::compatibility_iterator node = GetFirst ();

   while (node)
     {
   while (node)
     {

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

       if (bitmap->GetVisible())
         delete bitmap;
       node = next;
       if (bitmap->GetVisible())
         delete bitmap;
       node = next;


@@ -602,11 +685,11 @@ wxBitmapList::~wxBitmapList ()
 // Pen and Brush lists
 wxPenList::~wxPenList ()
 {
 // Pen and Brush lists
 wxPenList::~wxPenList ()
 {

-  wxNode *node = First ();
+  wxList::compatibility_iterator node = GetFirst ();

   while (node)
     {
   while (node)
     {

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

       if (pen->GetVisible())
         delete pen;
       node = next;
       if (pen->GetVisible())
         delete pen;
       node = next;


@@ -625,9 +708,9 @@ void wxPenList::RemovePen (wxPen * 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 ();
+        wxPen *each_pen = (wxPen *) node->GetData ();

         if (each_pen &&
                 each_pen->GetVisible() &&
                 each_pen->GetWidth () == width &&
         if (each_pen &&
                 each_pen->GetVisible() &&
                 each_pen->GetWidth () == width &&


@@ -657,11 +740,11 @@ wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, int width, int style)
 
 wxBrushList::~wxBrushList ()
 {
 
 wxBrushList::~wxBrushList ()
 {

-  wxNode *node = First ();
+  wxList::compatibility_iterator node = GetFirst ();

   while (node)
     {
   while (node)
     {

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

       if (brush && brush->GetVisible())
         delete brush;
       node = next;
       if (brush && brush->GetVisible())
         delete brush;
       node = next;


@@ -675,9 +758,9 @@ void wxBrushList::AddBrush (wxBrush * 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 ();
+        wxBrush *each_brush = (wxBrush *) node->GetData ();

         if (each_brush &&
                 each_brush->GetVisible() &&
                 each_brush->GetStyle () == style &&
         if (each_brush &&
                 each_brush->GetVisible() &&
                 each_brush->GetStyle () == style &&


@@ -712,15 +795,15 @@ void wxBrushList::RemoveBrush (wxBrush * brush)
 
 wxFontList::~wxFontList ()
 {
 
 wxFontList::~wxFontList ()
 {

-    wxNode *node = First ();
+    wxList::compatibility_iterator node = GetFirst ();

     while (node)
     {
         // Only delete objects that are 'visible', i.e.
         // that have been created using FindOrCreate...,
         // where the pointers are expected to be shared
         // (and therefore not deleted by any one part of an app).
     while (node)
     {
         // Only delete objects that are 'visible', i.e.
         // that have been created using FindOrCreate...,
         // where the pointers are expected to be shared
         // (and therefore not deleted by any one part of an app).

-        wxFont *font = (wxFont *) node->Data ();
-        wxNode *next = node->Next ();
+        wxFont *font = (wxFont *) node->GetData ();
+        wxList::compatibility_iterator next = node->GetNext ();

         if (font->GetVisible())
             delete font;
         node = next;
         if (font->GetVisible())
             delete font;
         node = next;


@@ -746,10 +829,10 @@ wxFont *wxFontList::FindOrCreateFont(int pointSize,
                                      wxFontEncoding encoding)
 {
     wxFont *font = (wxFont *)NULL;
                                      wxFontEncoding encoding)
 {
     wxFont *font = (wxFont *)NULL;

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

     {
     {

-        font = (wxFont *)node->Data();
+        font = (wxFont *)node->GetData();

         if ( font->GetVisible() &&
              font->Ok() &&
              font->GetPointSize () == pointSize &&
         if ( font->GetVisible() &&
              font->Ok() &&
              font->GetPointSize () == pointSize &&


@@ -844,12 +927,12 @@ wxSize wxGetDisplaySizeMM()
 
 wxResourceCache::~wxResourceCache ()
 {
 
 wxResourceCache::~wxResourceCache ()
 {

-    wxNode *node = First ();
+    wxList::compatibility_iterator node = GetFirst ();

     while (node) {
     while (node) {

-        wxObject *item = (wxObject *)node->Data();
+        wxObject *item = (wxObject *)node->GetData();

         delete item;
 
         delete item;
 

-        node = node->Next ();
+        node = node->GetNext ();

     }
 }
 
     }
 }