Another one bites the dust.

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

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index 913b36b7b90ec44ba452e3dda05dd230957d7111..154c2c700873a3e28fadf92e258cb327f9109a9e 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -20,6 +20,7 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

+#include "wx/event.h"

 #include "wx/gdicmn.h"
 #include "wx/brush.h"
 #include "wx/pen.h"
 #include "wx/gdicmn.h"
 #include "wx/brush.h"
 #include "wx/pen.h"


@@ -28,19 +29,26 @@
 #include "wx/cursor.h"
 #include "wx/font.h"
 #include "wx/palette.h"
 #include "wx/cursor.h"
 #include "wx/font.h"
 #include "wx/palette.h"

+#include "wx/app.h"

 
 

+#include "wx/log.h"

 #include <string.h>
 
 #ifdef __WXMSW__
 #include <windows.h>
 #endif
 
 #include <string.h>
 
 #ifdef __WXMSW__
 #include <windows.h>
 #endif
 

+#ifdef __WXMOTIF__
+#include <Xm/Xm.h>
+#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)
 #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(wxRect, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxPoint, wxObject)


@@ -64,17 +72,17 @@ wxRect::wxRect(const wxPoint& topLeft, const wxPoint& bottomRight)
   y = topLeft.y;
   width = bottomRight.x - topLeft.x;
   height = bottomRight.y - topLeft.y;
   y = topLeft.y;
   width = bottomRight.x - topLeft.x;
   height = bottomRight.y - topLeft.y;

-  
+

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

-  
+

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

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

   }
 }
 
   }
 }
 


@@ -86,9 +94,9 @@ wxRect::wxRect(const wxPoint& point, const wxSize& size)
 
 wxRect::wxRect(const wxRect& rect)
 {
 
 wxRect::wxRect(const wxRect& rect)
 {

-    x = rect.x; 
-    y = rect.y; 
-    width = rect.width; 
+    x = rect.x;
+    y = rect.y;
+    width = rect.width;

     height = rect.height;
 }
 
     height = rect.height;
 }
 


@@ -138,95 +146,95 @@ void wxColourDatabase::Initialize ()
   // Don't initialize for X: colours are found
   // in FindColour below.
   // Added: Not all
   // Don't initialize for X: colours are found
   // in FindColour below.
   // Added: Not all

-  
+

   struct cdef {
   struct cdef {

-   char *name;
+   wxChar *name;

    int r,g,b;
   };
   cdef cc;
   static cdef table[]={
    int r,g,b;
   };
   cdef cc;
   static cdef table[]={

-  
+

 // #ifdef __WXMSW__
 // #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},
+   {_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
 
 #if defined(__WXGTK__) || defined(__X__)
 // #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},
+   {_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
 #endif

-   
+

    {0,0,0,0}
   };
   int i;
    {0,0,0,0}
   };
   int i;


@@ -248,21 +256,34 @@ void wxColourDatabase::Initialize ()
 
 wxColour *wxColourDatabase::FindColour(const wxString& colour)
 {
 
 wxColour *wxColourDatabase::FindColour(const wxString& colour)
 {

-  wxNode *node = Find((char *) (const char *)colour);
+  // VZ: make the comparaison case insensitive
+  wxString str = colour;
+  str.MakeUpper();
+
+  wxNode *node = Find(str);

   if (node)
     return (wxColour *)node->Data();
   if (node)
     return (wxColour *)node->Data();

-    
+

 #ifdef __WXMSW__
   else return NULL;
 #endif
 
 #ifdef __WXMSW__
   else return NULL;
 #endif
 

+// TODO for other implementations. This should really go into
+// platform-specific directories.
+#ifdef __WXMAC__
+  else return NULL;
+#endif
+#ifdef __WXSTUBS__
+  else return NULL;
+#endif
+

 #ifdef __WXGTK__
   else {
     wxColour *col = new wxColour( colour );
 #ifdef __WXGTK__
   else {
     wxColour *col = new wxColour( colour );

-    
+

     if (!(col->Ok())) {
       delete col;
     if (!(col->Ok())) {
       delete col;

-      return NULL;
+      return (wxColour *) NULL;

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


@@ -274,7 +295,7 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour)
     XColor xcolour;
 
 #ifdef __WXMOTIF__
     XColor xcolour;
 
 #ifdef __WXMOTIF__

-    Display *display = XtDisplay(wxTheApp->topLevel) ;
+    Display *display = XtDisplay((Widget) wxTheApp->GetTopLevelWidget()) ;

 #endif
 #ifdef __XVIEW__
     Xv_Screen screen = xv_get(xview_server, SERVER_NTH_SCREEN, 0);
 #endif
 #ifdef __XVIEW__
     Xv_Screen screen = xv_get(xview_server, SERVER_NTH_SCREEN, 0);


@@ -283,7 +304,7 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour)
 #endif
 
     /* MATTHEW: [4] Use wxGetMainColormap */
 #endif
 
     /* MATTHEW: [4] Use wxGetMainColormap */

-    if (!XParseColor(display, wxGetMainColormap(display), colour,&xcolour))
+    if (!XParseColor(display, (Colormap) wxTheApp->GetMainColormap((WXDisplay*) display), colour,&xcolour))

       return NULL;
 
     unsigned char r = (unsigned char)(xcolour.red >> 8);
       return NULL;
 
     unsigned char r = (unsigned char)(xcolour.red >> 8);


@@ -303,34 +324,36 @@ wxString wxColourDatabase::FindName (const wxColour& colour) const
   unsigned char red = colour.Red ();
   unsigned char green = colour.Green ();
   unsigned char blue = colour.Blue ();
   unsigned char red = colour.Red ();
   unsigned char green = colour.Green ();
   unsigned char blue = colour.Blue ();

-  
+

   for (wxNode * node = First (); node; node = node->Next ())
   {
       wxColour *col = (wxColour *) node->Data ();
   for (wxNode * node = First (); node; node = node->Next ())
   {
       wxColour *col = (wxColour *) node->Data ();

-      
+

       if (col->Red () == red && col->Green () == green && col->Blue () == blue)
       if (col->Red () == red && col->Green () == green && col->Blue () == blue)

-       {
-         char *found = node->key.string;
-         if (found)
-           return wxString(found);
-       }
+        {
+          const wxChar *found = node->GetKeyString();
+          if (found)
+            return wxString(found);
+        }

   }
   }

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

 
 }
 
 
 }
 

-void 
-wxInitializeStockObjects ()
-{
+void wxInitializeStockLists () {

   wxTheBrushList = new wxBrushList;
   wxThePenList = new wxPenList;
   wxTheFontList = new wxFontList;
   wxTheBitmapList = new wxBitmapList;
   wxTheBrushList = new wxBrushList;
   wxThePenList = new wxPenList;
   wxTheFontList = new wxFontList;
   wxTheBitmapList = new wxBitmapList;

+}

 
 

+void wxInitializeStockObjects ()
+{

 #ifdef __WXMOTIF__
 #endif
 #ifdef __X__
 #ifdef __WXMOTIF__
 #endif
 #ifdef __X__

-  wxFontPool = new XFontPool;
+  // TODO
+  //  wxFontPool = new XFontPool;

 #endif
 
   wxNORMAL_FONT = new wxFont (12, wxMODERN, wxNORMAL, wxNORMAL);
 #endif
 
   wxNORMAL_FONT = new wxFont (12, wxMODERN, wxNORMAL, wxNORMAL);


@@ -373,47 +396,53 @@ wxInitializeStockObjects ()
   wxCROSS_CURSOR = new wxCursor (wxCURSOR_CROSS);
 }
 
   wxCROSS_CURSOR = new wxCursor (wxCURSOR_CROSS);
 }
 

-void 
-wxDeleteStockObjects ()
-{
-  DELETEP(wxNORMAL_FONT);
-  DELETEP(wxSMALL_FONT);
-  DELETEP(wxITALIC_FONT);
-  DELETEP(wxSWISS_FONT);
-
-  DELETEP(wxRED_PEN);
-  DELETEP(wxCYAN_PEN);
-  DELETEP(wxGREEN_PEN);
-  DELETEP(wxBLACK_PEN);
-  DELETEP(wxWHITE_PEN);
-  DELETEP(wxTRANSPARENT_PEN);
-  DELETEP(wxBLACK_DASHED_PEN);
-  DELETEP(wxGREY_PEN);
-  DELETEP(wxMEDIUM_GREY_PEN);
-  DELETEP(wxLIGHT_GREY_PEN);
-
-  DELETEP(wxBLUE_BRUSH);
-  DELETEP(wxGREEN_BRUSH);
-  DELETEP(wxWHITE_BRUSH);
-  DELETEP(wxBLACK_BRUSH);
-  DELETEP(wxTRANSPARENT_BRUSH);
-  DELETEP(wxCYAN_BRUSH);
-  DELETEP(wxRED_BRUSH);
-  DELETEP(wxGREY_BRUSH);
-  DELETEP(wxMEDIUM_GREY_BRUSH);
-  DELETEP(wxLIGHT_GREY_BRUSH);
-
-  DELETEP(wxBLACK);
-  DELETEP(wxWHITE);
-  DELETEP(wxRED);
-  DELETEP(wxBLUE);
-  DELETEP(wxGREEN);
-  DELETEP(wxCYAN);
-  DELETEP(wxLIGHT_GREY);
-
-  DELETEP(wxSTANDARD_CURSOR);
-  DELETEP(wxHOURGLASS_CURSOR);
-  DELETEP(wxCROSS_CURSOR);
+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 ()
 }
 
 wxBitmapList::wxBitmapList ()


@@ -422,29 +451,33 @@ wxBitmapList::wxBitmapList ()
 
 wxBitmapList::~wxBitmapList ()
 {
 
 wxBitmapList::~wxBitmapList ()
 {

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

   wxNode *node = First ();
   while (node)
     {
       wxBitmap *bitmap = (wxBitmap *) node->Data ();
       wxNode *next = node->Next ();
   wxNode *node = First ();
   while (node)
     {
       wxBitmap *bitmap = (wxBitmap *) node->Data ();
       wxNode *next = node->Next ();

-      delete bitmap;
-//      bitmap->FreeResource(TRUE);
+      if (bitmap->GetVisible())
+        delete bitmap;

       node = next;
     }
       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)
     {
       wxPen *pen = (wxPen *) node->Data ();
       wxNode *next = node->Next ();
   wxNode *node = First ();
   while (node)
     {
       wxPen *pen = (wxPen *) node->Data ();
       wxNode *next = node->Next ();

-      delete pen;
-//      pen->FreeResource(TRUE);
+      if (pen->GetVisible())
+        delete pen;

       node = next;
     }
       node = next;
     }

+#endif

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


@@ -463,12 +496,12 @@ wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, int width, int style)
     {
       wxPen *each_pen = (wxPen *) node->Data ();
       if (each_pen && each_pen->GetVisible() &&
     {
       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;
+          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);
 
     }
   wxPen *pen = new wxPen (colour, width, style);
 


@@ -480,25 +513,19 @@ wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, int width, int style)
   return pen;
 }
 
   return pen;
 }
 

-wxPen *wxPenList::FindOrCreatePen (const wxString& colour, int width, int style)
-{
-  wxColour *the_colour = wxTheColourDatabase->FindColour (colour);
-  if (the_colour)
-    return FindOrCreatePen (*the_colour, width, style);
-  else
-    return NULL;
-}
-

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

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

   wxNode *node = First ();
   while (node)
     {
       wxBrush *brush = (wxBrush *) node->Data ();
       wxNode *next = node->Next ();
   wxNode *node = First ();
   while (node)
     {
       wxBrush *brush = (wxBrush *) node->Data ();
       wxNode *next = node->Next ();

-      delete brush;
+      if (brush->GetVisible())
+        delete brush;

       node = next;
     }
       node = next;
     }

+#endif

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


@@ -512,11 +539,11 @@ wxBrush *wxBrushList::FindOrCreateBrush (const wxColour& colour, int style)
     {
       wxBrush *each_brush = (wxBrush *) node->Data ();
       if (each_brush && each_brush->GetVisible() &&
     {
       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;
+          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
     }
   // Yes, we can return a pointer to this in a later FindOrCreateBrush call,
   // because we created it within FindOrCreateBrush. Safeguards against


@@ -527,15 +554,6 @@ wxBrush *wxBrushList::FindOrCreateBrush (const wxColour& colour, int style)
   return brush;
 }
 
   return brush;
 }
 

-wxBrush *wxBrushList::FindOrCreateBrush (const wxString& colour, int style)
-{
-  wxColour *the_colour = wxTheColourDatabase->FindColour (colour);
-  if (the_colour)
-    return FindOrCreateBrush (*the_colour, style);
-  else
-    return NULL;
-}
-

 void wxBrushList::RemoveBrush (wxBrush * brush)
 {
   DeleteObject (brush);
 void wxBrushList::RemoveBrush (wxBrush * brush)
 {
   DeleteObject (brush);


@@ -543,26 +561,19 @@ void wxBrushList::RemoveBrush (wxBrush * brush)
 
 wxFontList::~wxFontList ()
 {
 
 wxFontList::~wxFontList ()
 {

-#ifdef __WXMSW__

   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 ();
       wxFont *font = (wxFont *) node->Data ();
       wxNode *next = node->Next ();

-      delete font;
+          if (font->GetVisible())
+                delete font;

       node = next;
       node = next;

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

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


@@ -576,23 +587,23 @@ void wxFontList::RemoveFont (wxFont * font)
 }
 
 wxFont *wxFontList::
 }
 
 wxFont *wxFontList::

-       FindOrCreateFont (int PointSize, int FamilyOrFontId, int Style, int Weight, bool underline, const wxString& Face)
+        FindOrCreateFont (int PointSize, int FamilyOrFontId, int Style, int Weight, bool underline, const wxString& Face)

 {
   for (wxNode * node = First (); node; node = node->Next ())
     {
       wxFont *each_font = (wxFont *) node->Data ();
       if (each_font && each_font->GetVisible() && each_font->Ok() &&
 {
   for (wxNode * 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__) || (defined(__WXMSW__) && USE_PORTABLE_FONTS_IN_MSW)
-         each_font->GetFontId () == FamilyOrFontId) /* New font system */
-#else
-         each_font->GetFamily () == FamilyOrFontId &&
-          (!each_font->GetFaceName() || each_font->GetFaceName() == Face))
-#endif
-       return each_font;
+          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;

     }
   wxFont *font = new wxFont (PointSize, FamilyOrFontId, Style, Weight, underline, Face);
   font->SetVisible(TRUE);
     }
   wxFont *font = new wxFont (PointSize, FamilyOrFontId, Style, Weight, underline, Face);
   font->SetVisible(TRUE);


@@ -600,9 +611,14 @@ wxFont *wxFontList::
 }
 
 void wxBitmapList::AddBitmap(wxBitmap *bitmap)
 }
 
 void wxBitmapList::AddBitmap(wxBitmap *bitmap)

-{ Append(bitmap); }
+{
+    Append(bitmap);
+}
+

 void wxBitmapList::RemoveBitmap(wxBitmap *bitmap)
 void wxBitmapList::RemoveBitmap(wxBitmap *bitmap)

-{ DeleteObject(bitmap); }
+{
+    DeleteObject(bitmap);
+}

 
 wxSize wxGetDisplaySize()
 {
 
 wxSize wxGetDisplaySize()
 {


@@ -611,3 +627,33 @@ wxSize wxGetDisplaySize()
     return wxSize(x, y);
 }
 
     return wxSize(x, y);
 }
 

+wxResourceCache::~wxResourceCache ()
+{
+  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;
+    }
+
+    if (item->IsKindOf(CLASSINFO(wxBitmap))) {
+      wxBitmap *bitmap = (wxBitmap *)item;
+      delete bitmap;
+    }
+
+    if (item->IsKindOf(CLASSINFO(wxColour))) {
+      wxColour *colour = (wxColour *)item;
+      delete colour;
+    }
+
+    wxNode *next = node->Next ();
+    node = next;
+  }
+}
+