wxDataObejct and related changes (won't compile right now)

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

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index 1045d4c0ab5abcb4966736bf2ac3454d264ee059..106d32a3efa468fcfb5f09e0290933eebd56194c 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,36 +29,31 @@
 #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/dc.h"
+#include "wx/utils.h"

 
 

+#include "wx/log.h"

 #include <string.h>
 
 #ifdef __WXMSW__
 #include <windows.h>
 #endif
 
 #include <string.h>
 
 #ifdef __WXMSW__
 #include <windows.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)
-IMPLEMENT_DYNAMIC_CLASS(wxResourceCache, wxList)
-/*
-IMPLEMENT_DYNAMIC_CLASS(wxRect, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxPoint, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxRealPoint, wxObject)
-*/
+#ifdef __WXMOTIF__
+#include <Xm/Xm.h>

 #endif
 
 #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;
-}
+#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_ABSTRACT_CLASS(wxDCBase, wxObject)
+#endif

 
 wxRect::wxRect(const wxPoint& topLeft, const wxPoint& bottomRight)
 {
 
 wxRect::wxRect(const wxPoint& topLeft, const wxPoint& bottomRight)
 {


@@ -65,17 +61,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;

   }
 }
 
   }
 }
 


@@ -85,38 +81,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)
+const 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)

 {
 }
 
 {
 }
 


@@ -139,95 +135,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},
+   {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},

 // #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},
+   {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},

 #endif
 #endif

-   
+

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


@@ -249,16 +245,26 @@ 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

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

 
 // TODO for other implementations. This should really go into
 // platform-specific directories.
 
 // 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 __WXSTUBS__
   else return NULL;
 #endif


@@ -266,10 +272,10 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour)
 #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;


@@ -281,7 +287,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);


@@ -290,7 +296,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);


@@ -307,23 +313,29 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour)
 
 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 ();
-  
-  for (wxNode * node = First (); node; node = node->Next ())
-  {
-      wxColour *col = (wxColour *) node->Data ();
-      
-      if (col->Red () == red && col->Green () == green && col->Blue () == blue)
-       {
-         char *found = node->key.string;
-         if (found)
-           return wxString(found);
-       }
-  }
-  return wxString("");                 // Not Found
+    wxString name;

 
 

+    unsigned char red = colour.Red ();
+    unsigned char green = colour.Green ();
+    unsigned char blue = colour.Blue ();
+
+    for (wxNode * node = First (); node; node = node->Next ())
+    {
+        wxColour *col = (wxColour *) node->Data ();
+
+        if (col->Red () == red && col->Green () == green && col->Blue () == blue)
+        {
+            const wxChar *found = node->GetKeyString();
+            if ( found )
+            {
+                name = found;
+
+                break;
+            }
+        }
+    }
+
+    return name;

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


@@ -338,7 +350,8 @@ 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);


@@ -381,8 +394,7 @@ void wxInitializeStockObjects ()
   wxCROSS_CURSOR = new wxCursor (wxCURSOR_CROSS);
 }
 
   wxCROSS_CURSOR = new wxCursor (wxCURSOR_CROSS);
 }
 

-void 
-wxDeleteStockObjects ()
+void wxDeleteStockObjects ()

 {
   wxDELETE(wxNORMAL_FONT);
   wxDELETE(wxSMALL_FONT);
 {
   wxDELETE(wxNORMAL_FONT);
   wxDELETE(wxSMALL_FONT);


@@ -437,29 +449,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)


@@ -478,12 +494,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);
 


@@ -495,25 +511,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)


@@ -527,11 +537,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


@@ -542,15 +552,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);


@@ -558,26 +559,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)


@@ -591,23 +585,28 @@ 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 */
+          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
+#if defined(__WXGTK__)
+          (each_font->GetFamily() == FamilyOrFontId ||
+           (each_font->GetFamily() == wxSWISS && FamilyOrFontId == wxDEFAULT)) &&

 #else
 #else

-         each_font->GetFamily () == FamilyOrFontId &&
-          (!each_font->GetFaceName() || each_font->GetFaceName() == Face))
+          each_font->GetFamily() == FamilyOrFontId &&

 #endif
 #endif

-       return each_font;
+          ((each_font->GetFaceName() == wxT("")) || 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);


@@ -615,9 +614,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()
 {


@@ -626,13 +630,8 @@ wxSize wxGetDisplaySize()
     return wxSize(x, y);
 }
 
     return wxSize(x, y);
 }
 

-wxResourceCache::wxResourceCache () : wxList() {
-}
-
-wxResourceCache::wxResourceCache (const unsigned int the_key_type) : wxList(the_key_type) {
-}
-
-wxResourceCache::~wxResourceCache () {
+wxResourceCache::~wxResourceCache ()
+{

   wxNode *node = First ();
   while (node) {
     wxGDIObject *item = (wxGDIObject *)node->Data();
   wxNode *node = First ();
   while (node) {
     wxGDIObject *item = (wxGDIObject *)node->Data();