added wxTo/FromString(wxColour) (part of patch 1753875)

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

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index 58f901a085e271587d47d4f55ee8dc2899705b16..7b6e3db37c92949066c8d8798a9ab24ddd1bcdc6 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        gdicmn.cpp
+// Name:        src/common/gdicmn.cpp

 // Purpose:     Common GDI classes
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     Common GDI classes
 // Author:      Julian Smart
 // Modified by:


@@ -9,61 +9,54 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "gdicmn.h"
-#endif
-
-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#endif
-

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

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

-#include "wx/event.h"

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

-#include "wx/brush.h"
-#include "wx/pen.h"
-#include "wx/bitmap.h"
-#include "wx/icon.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/settings.h"
-#include "wx/hashmap.h"
-
-#include "wx/log.h"
-#include <string.h>
-
-#if defined(__WXMSW__) && !defined(__PALMOS__)
-#include "wx/msw/wrapwin.h"
+#include "wx/gdiobj.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/pen.h"
+    #include "wx/brush.h"
+    #include "wx/palette.h"
+    #include "wx/icon.h"
+    #include "wx/iconbndl.h"
+    #include "wx/cursor.h"
+    #include "wx/settings.h"
+    #include "wx/bitmap.h"
+    #include "wx/colour.h"
+    #include "wx/font.h"

 #endif
 
 #endif
 

-#ifdef __WXMOTIF__
-#ifdef __VMS__
-#pragma message disable nosimpint
-#endif
-#include <Xm/Xm.h>
-#ifdef __VMS__
-#pragma message enable nosimpint
-#endif
-#endif

 
 

-#ifdef __WXX11__
-#include "X11/Xlib.h"
-#endif
+IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject)
+

 
 

-#ifdef __WXMAC__
-#include "wx/mac/private.h"
-#include "wx/mac/uma.h"
+WXDLLIMPEXP_DATA_CORE(wxBrushList*) wxTheBrushList;
+WXDLLIMPEXP_DATA_CORE(wxFontList*)  wxTheFontList;
+WXDLLIMPEXP_DATA_CORE(wxPenList*)   wxThePenList;
+
+WXDLLIMPEXP_DATA_CORE(wxColourDatabase*) wxTheColourDatabase;
+
+WXDLLIMPEXP_DATA_CORE(wxBitmap)  wxNullBitmap;
+WXDLLIMPEXP_DATA_CORE(wxBrush)   wxNullBrush;
+WXDLLIMPEXP_DATA_CORE(wxColour)  wxNullColour;
+WXDLLIMPEXP_DATA_CORE(wxCursor)  wxNullCursor;
+WXDLLIMPEXP_DATA_CORE(wxFont)    wxNullFont;
+WXDLLIMPEXP_DATA_CORE(wxIcon)    wxNullIcon;
+WXDLLIMPEXP_DATA_CORE(wxPen)     wxNullPen;
+#if wxUSE_PALETTE
+WXDLLIMPEXP_DATA_CORE(wxPalette) wxNullPalette;

 #endif
 #endif

+WXDLLIMPEXP_DATA_CORE(wxIconBundle) wxNullIconBundle;
+
+const wxSize wxDefaultSize(wxDefaultCoord, wxDefaultCoord);
+const wxPoint wxDefaultPosition(wxDefaultCoord, wxDefaultCoord);

 
 #if wxUSE_EXTENDED_RTTI
 
 
 #if wxUSE_EXTENDED_RTTI
 


@@ -95,8 +88,6 @@ wxCUSTOM_TYPE_INFO(wxSize, wxToStringConverter<wxSize> , wxFromStringConverter<w
 
 #endif
 
 
 #endif
 

-IMPLEMENT_ABSTRACT_CLASS(wxDCBase, wxObject)
-

 wxRect::wxRect(const wxPoint& point1, const wxPoint& point2)
 {
     x = point1.x;
 wxRect::wxRect(const wxPoint& point1, const wxPoint& point2)
 {
     x = point1.x;


@@ -119,65 +110,65 @@ wxRect::wxRect(const wxPoint& point1, const wxPoint& point2)
     height++;
 }
 
     height++;
 }
 

-wxRect::wxRect(const wxPoint& point, const wxSize& size)
-{
-    x = point.x; y = point.y;
-    width = size.x; height = size.y;
-}
-
-wxRect::wxRect(const wxSize& size)
+wxRect& wxRect::Union(const wxRect& rect)

 {
 {

-    x = 0; y = 0;
-    width = size.x; height = size.y;
-}
-
-bool wxRect::operator==(const wxRect& rect) const
-{
-    return ((x == rect.x) &&
-            (y == rect.y) &&
-            (width == rect.width) &&
-            (height == rect.height));
-}
-
-wxRect& wxRect::operator += (const wxRect& rect)
-{
-    *this = (*this + rect);
-    return ( *this ) ;
-}
+    // ignore empty rectangles: union with an empty rectangle shouldn't extend
+    // this one to (0, 0)
+    if ( !width || !height )
+    {
+        *this = rect;
+    }
+    else if ( rect.width && rect.height )
+    {
+        int x1 = wxMin(x, rect.x);
+        int y1 = wxMin(y, rect.y);
+        int y2 = wxMax(y + height, rect.height + rect.y);
+        int x2 = wxMax(x + width, rect.width + rect.x);
+
+        x = x1;
+        y = y1;
+        width = x2 - x1;
+        height = y2 - y1;
+    }
+    //else: we're not empty and rect is empty

 
 

-wxRect wxRect::operator + (const wxRect& rect) const
-{
-    int x1 = wxMin(this->x, rect.x);
-    int y1 = wxMin(this->y, rect.y);
-    int y2 = wxMax(y+height, rect.height+rect.y);
-    int x2 = wxMax(x+width, rect.width+rect.x);
-    return wxRect(x1, y1, x2-x1, y2-y1);
+    return *this;

 }
 
 wxRect& wxRect::Inflate(wxCoord dx, wxCoord dy)
 {
 }
 
 wxRect& wxRect::Inflate(wxCoord dx, wxCoord dy)
 {

-    x -= dx;
-    y -= dy;
-    width += 2*dx;
-    height += 2*dy;
-
-    // check that we didn't make the rectangle invalid by accident (you almost
-    // never want to have negative coords and never want negative size)
-    if ( x < 0 )
-        x = 0;
-    if ( y < 0 )
-        y = 0;
-
-    // what else can we do?
-    if ( width < 0 )
-        width = 0;
-    if ( height < 0 )
-        height = 0;
+     if (-2*dx>width)
+     {
+         // Don't allow deflate to eat more width than we have,
+         // a well-defined rectangle cannot have negative width.
+         x+=width/2;
+         width=0;
+     }
+     else
+     {
+         // The inflate is valid.
+         x-=dx;
+         width+=2*dx;
+     }
+
+     if (-2*dy>height)
+     {
+         // Don't allow deflate to eat more height than we have,
+         // a well-defined rectangle cannot have negative height.
+         y+=height/2;
+         height=0;
+     }
+     else
+     {
+         // The inflate is valid.
+         y-=dy;
+         height+=2*dy;
+     }

 
     return *this;
 }
 
 
     return *this;
 }
 

-bool wxRect::Inside(int cx, int cy) const
+bool wxRect::Contains(int cx, int cy) const

 {
     return ( (cx >= x) && (cy >= y)
           && ((cy - y) < height)
 {
     return ( (cx >= x) && (cy >= y)
           && ((cy - y) < height)


@@ -185,6 +176,11 @@ bool wxRect::Inside(int cx, int cy) const
           );
 }
 
           );
 }
 

+bool wxRect::Contains(const wxRect& rect) const
+{
+    return Contains(rect.GetTopLeft()) && Contains(rect.GetBottomRight());
+}
+

 wxRect& wxRect::Intersect(const wxRect& rect)
 {
     int x2 = GetRight(),
 wxRect& wxRect::Intersect(const wxRect& rect)
 {
     int x2 = GetRight(),


@@ -219,6 +215,38 @@ bool wxRect::Intersects(const wxRect& rect) const
     return r.width != 0;
 }
 
     return r.width != 0;
 }
 

+wxRect& wxRect::operator+=(const wxRect& rect)
+{
+    *this = *this + rect;
+    return *this;
+}
+
+
+wxRect& wxRect::operator*=(const wxRect& rect)
+{
+    *this = *this * rect;
+    return *this;
+}
+
+
+wxRect operator+(const wxRect& r1, const wxRect& r2)
+{
+    int x1 = wxMin(r1.x, r2.x);
+    int y1 = wxMin(r1.y, r2.y);
+    int y2 = wxMax(r1.y+r1.height, r2.height+r2.y);
+    int x2 = wxMax(r1.x+r1.width, r2.width+r2.x);
+    return wxRect(x1, y1, x2-x1, y2-y1);
+}
+
+wxRect operator*(const wxRect& r1, const wxRect& r2)
+{
+    int x1 = wxMax(r1.x, r2.x);
+    int y1 = wxMax(r1.y, r2.y);
+    int y2 = wxMin(r1.y+r1.height, r2.height+r2.y);
+    int x2 = wxMin(r1.x+r1.width, r2.width+r2.x);
+    return wxRect(x1, y1, x2-x1, y2-y1);
+}
+

 // ============================================================================
 // wxColourDatabase
 // ============================================================================
 // ============================================================================
 // wxColourDatabase
 // ============================================================================


@@ -316,7 +344,7 @@ void wxColourDatabase::Initialize()
         {wxT("ORANGE RED"), 255, 0, 127},
         {wxT("ORCHID"), 219, 112, 219},
         {wxT("PALE GREEN"), 143, 188, 143},
         {wxT("ORANGE RED"), 255, 0, 127},
         {wxT("ORCHID"), 219, 112, 219},
         {wxT("PALE GREEN"), 143, 188, 143},

-        {wxT("PINK"), 188, 143, 234},
+        {wxT("PINK"), 255, 192, 203},

         {wxT("PLUM"), 234, 173, 234},
         {wxT("PURPLE"), 176, 0, 255},
         {wxT("RED"), 255, 0, 0},
         {wxT("PLUM"), 234, 173, 234},
         {wxT("PURPLE"), 176, 0, 255},
         {wxT("RED"), 255, 0, 0},


@@ -387,7 +415,7 @@ void wxColourDatabase::AddColour(const wxString& name, const wxColour& colour)
     }
     else // new colour
     {
     }
     else // new colour
     {

-        (*m_map)[name] = new wxColour(colour);
+        (*m_map)[colName] = new wxColour(colour);

     }
 }
 
     }
 }
 


@@ -396,8 +424,6 @@ wxColour wxColourDatabase::Find(const wxString& colour) const
     wxColourDatabase * const self = wxConstCast(this, wxColourDatabase);
     self->Initialize();
 
     wxColourDatabase * const self = wxConstCast(this, wxColourDatabase);
     self->Initialize();
 

-    // first look among the existing colours
-

     // make the comparaison case insensitive and also match both grey and gray
     wxString colName = colour;
     colName.MakeUpper();
     // make the comparaison case insensitive and also match both grey and gray
     wxString colName = colour;
     colName.MakeUpper();


@@ -411,48 +437,12 @@ wxColour wxColourDatabase::Find(const wxString& colour) const
     if ( it != m_map->end() )
         return *(it->second);
 
     if ( it != m_map->end() )
         return *(it->second);
 

-    // if we didn't find it, query the system, maybe it knows about it
-#if defined(__WXGTK__) || defined(__X__)
-    wxColour col = wxColour::CreateByName(colour);
-
-    if ( col.Ok() )
-    {
-        // cache it
-        self->AddColour(colour, col);
-    }
-
-    return col;
-#elif defined(__X__)
-    // TODO: move this to wxColour::CreateByName()
-    XColor xcolour;
-
-#ifdef __WXMOTIF__
-    Display *display = XtDisplay((Widget) wxTheApp->GetTopLevelWidget()) ;
-#endif
-#ifdef __WXX11__
-    Display* display = (Display*) wxGetDisplay();
-#endif
-    /* MATTHEW: [4] Use wxGetMainColormap */
-    if (!XParseColor(display, (Colormap) wxTheApp->GetMainColormap((WXDisplay*) display), colour.ToAscii() ,&xcolour))
-        return NULL;
-
-#if wxUSE_NANOX
-    unsigned char r = (unsigned char)(xcolour.red);
-    unsigned char g = (unsigned char)(xcolour.green);
-    unsigned char b = (unsigned char)(xcolour.blue);
-#else
-    unsigned char r = (unsigned char)(xcolour.red >> 8);
-    unsigned char g = (unsigned char)(xcolour.green >> 8);
-    unsigned char b = (unsigned char)(xcolour.blue >> 8);
-#endif
-
-    wxColour col(r, g, b);
-    AddColour(colour, col);
-
-    return col;
-#else // other platform
+    // we did not find any result in existing colours:
+    // we won't use wxString -> wxColour conversion because the
+    // wxColour::Set(const wxString &) function which does that conversion
+    // internally uses this function (wxColourDatabase::Find) and we want
+    // to avoid infinite recursion !

     return wxNullColour;
     return wxNullColour;

-#endif // platforms

 }
 
 wxString wxColourDatabase::FindName(const wxColour& colour) const
 }
 
 wxString wxColourDatabase::FindName(const wxColour& colour) const


@@ -475,6 +465,7 @@ wxString wxColourDatabase::FindName(const wxColour& colour) const
 // deprecated wxColourDatabase methods
 // ----------------------------------------------------------------------------
 
 // deprecated wxColourDatabase methods
 // ----------------------------------------------------------------------------
 

+#if WXWIN_COMPATIBILITY_2_6

 wxColour *wxColourDatabase::FindColour(const wxString& name)
 {
     // This function is deprecated, use Find() instead.
 wxColour *wxColourDatabase::FindColour(const wxString& name)
 {
     // This function is deprecated, use Find() instead.


@@ -503,160 +494,217 @@ wxColour *wxColourDatabase::FindColour(const wxString& name)
 
     return new wxColour(s_col);
 }
 
     return new wxColour(s_col);
 }

+#endif // WXWIN_COMPATIBILITY_2_6

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

-void wxInitializeStockLists()
+static wxStockGDI gs_wxStockGDI_instance;
+wxStockGDI* wxStockGDI::ms_instance = &gs_wxStockGDI_instance;
+wxObject* wxStockGDI::ms_stockObject[ITEMCOUNT];
+
+wxStockGDI::wxStockGDI()

 {
 {

-    wxTheColourDatabase = new wxColourDatabase;
+}

 
 

-    wxTheBrushList = new wxBrushList;
-    wxThePenList = new wxPenList;
-    wxTheFontList = new wxFontList;
-    wxTheBitmapList = new wxBitmapList;
+wxStockGDI::~wxStockGDI()
+{

 }
 
 }
 

-void wxInitializeStockObjects ()
+void wxStockGDI::DeleteAll()

 {
 {

-#ifdef __WXMOTIF__
-#endif
-#ifdef __X__
-  // TODO
-  //  wxFontPool = new XFontPool;
-#endif
+    for (unsigned i = 0; i < ITEMCOUNT; i++)
+    {
+        delete ms_stockObject[i];
+        ms_stockObject[i] = NULL;
+    }
+}

 
 

-  // why under MSW fonts shouldn't have the standard system size?
-/*
-#ifdef __WXMSW__
-  static const int sizeFont = 10;
-#else
-#endif
-*/
-#if defined(__WXMAC__)
-    // retrieve size of system font for all stock fonts
-    int sizeFont = 12;
-
-    Str255 fontName ;
-    SInt16 fontSize ;
-    Style fontStyle ;
-
-    GetThemeFont(kThemeSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
-    sizeFont = fontSize ;
-#ifdef __WXMAC_CLASSIC__
-    wxNORMAL_FONT = new wxFont (fontSize, wxMODERN, wxNORMAL, wxNORMAL , false , wxMacMakeStringFromPascal(fontName) );
-#else
-    wxNORMAL_FONT = new wxFont () ;
-    wxNORMAL_FONT->MacCreateThemeFont( kThemeSystemFont );
-#endif
-#elif defined(__WXPM__)
-    static const int sizeFont = 12;
-#else
-    wxNORMAL_FONT = new wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
-    static const int sizeFont = wxNORMAL_FONT->GetPointSize();
-#endif
+const wxBrush* wxStockGDI::GetBrush(Item item)
+{
+    wxBrush* brush = wx_static_cast(wxBrush*, ms_stockObject[item]);
+    if (brush == NULL)
+    {
+        switch (item)
+        {
+        case BRUSH_BLACK:
+            brush = new wxBrush(*GetColour(COLOUR_BLACK), wxSOLID);
+            break;
+        case BRUSH_BLUE:
+            brush = new wxBrush(*GetColour(COLOUR_BLUE), wxSOLID);
+            break;
+        case BRUSH_CYAN:
+            brush = new wxBrush(*GetColour(COLOUR_CYAN), wxSOLID);
+            break;
+        case BRUSH_GREEN:
+            brush = new wxBrush(*GetColour(COLOUR_GREEN), wxSOLID);
+            break;
+        case BRUSH_GREY:
+            brush = new wxBrush(wxColour(wxT("GREY")), wxSOLID);
+            break;
+        case BRUSH_LIGHTGREY:
+            brush = new wxBrush(*GetColour(COLOUR_LIGHTGREY), wxSOLID);
+            break;
+        case BRUSH_MEDIUMGREY:
+            brush = new wxBrush(wxColour(wxT("MEDIUM GREY")), wxSOLID);
+            break;
+        case BRUSH_RED:
+            brush = new wxBrush(*GetColour(COLOUR_RED), wxSOLID);
+            break;
+        case BRUSH_TRANSPARENT:
+            brush = new wxBrush(*GetColour(COLOUR_BLACK), wxTRANSPARENT);
+            break;
+        case BRUSH_WHITE:
+            brush = new wxBrush(*GetColour(COLOUR_WHITE), wxSOLID);
+            break;
+        default:
+            wxFAIL;
+        }
+        ms_stockObject[item] = brush;
+    }
+    return brush;
+}

 
 

-#if defined(__WXPM__)
-    /*
-    // Basic OS/2 has a fairly limited number of fonts and these are as good
-    // as I can do to get something that looks halfway "wx" normal
-    */
-    wxNORMAL_FONT = new wxFont (sizeFont, wxMODERN, wxNORMAL, wxBOLD);
-    wxSMALL_FONT = new wxFont (sizeFont - 4, wxSWISS, wxNORMAL, wxNORMAL); /* Helv */
-    wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL);
-    wxSWISS_FONT = new wxFont (sizeFont, wxSWISS, wxNORMAL, wxNORMAL); /* Helv */
-#elif defined(__WXMAC__)
-    wxSWISS_FONT = new wxFont (sizeFont, wxSWISS, wxNORMAL, wxNORMAL); /* Helv */
-    wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL);
-#ifdef __WXMAC_CLASSIC__
-  GetThemeFont(kThemeSmallSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
-    wxSMALL_FONT = new wxFont (fontSize, wxSWISS, wxNORMAL, wxNORMAL , false , wxMacMakeStringFromPascal( fontName ) );
-#else
-    wxSMALL_FONT = new wxFont () ;
-    wxSMALL_FONT->MacCreateThemeFont( kThemeSmallSystemFont );
-#endif
-#else
-    wxSMALL_FONT = new wxFont (sizeFont - 2, wxSWISS, wxNORMAL, wxNORMAL);
-    wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL);
-    wxSWISS_FONT = new wxFont (sizeFont, wxSWISS, wxNORMAL, wxNORMAL);
-#endif
+const wxColour* wxStockGDI::GetColour(Item item)
+{
+    wxColour* colour = wx_static_cast(wxColour*, ms_stockObject[item]);
+    if (colour == NULL)
+    {
+        switch (item)
+        {
+        case COLOUR_BLACK:
+            colour = new wxColour(0, 0, 0);
+            break;
+        case COLOUR_BLUE:
+            colour = new wxColour(0, 0, 255);
+            break;
+        case COLOUR_CYAN:
+            colour = new wxColour(wxT("CYAN"));
+            break;
+        case COLOUR_GREEN:
+            colour = new wxColour(0, 255, 0);
+            break;
+        case COLOUR_LIGHTGREY:
+            colour = new wxColour(wxT("LIGHT GREY"));
+            break;
+        case COLOUR_RED:
+            colour = new wxColour(255, 0, 0);
+            break;
+        case COLOUR_WHITE:
+            colour = new wxColour(255, 255, 255);
+            break;
+        default:
+            wxFAIL;
+        }
+        ms_stockObject[item] = colour;
+    }
+    return colour;
+}

 
 

-    wxRED_PEN = new wxPen (wxT("RED"), 1, wxSOLID);
-    wxCYAN_PEN = new wxPen (wxT("CYAN"), 1, wxSOLID);
-    wxGREEN_PEN = new wxPen (wxT("GREEN"), 1, wxSOLID);
-    wxBLACK_PEN = new wxPen (wxT("BLACK"), 1, wxSOLID);
-    wxWHITE_PEN = new wxPen (wxT("WHITE"), 1, wxSOLID);
-    wxTRANSPARENT_PEN = new wxPen (wxT("BLACK"), 1, wxTRANSPARENT);
-    wxBLACK_DASHED_PEN = new wxPen (wxT("BLACK"), 1, wxSHORT_DASH);
-    wxGREY_PEN = new wxPen (wxT("GREY"), 1, wxSOLID);
-    wxMEDIUM_GREY_PEN = new wxPen (wxT("MEDIUM GREY"), 1, wxSOLID);
-    wxLIGHT_GREY_PEN = new wxPen (wxT("LIGHT GREY"), 1, wxSOLID);
-
-    wxBLUE_BRUSH = new wxBrush (wxT("BLUE"), wxSOLID);
-    wxGREEN_BRUSH = new wxBrush (wxT("GREEN"), wxSOLID);
-    wxWHITE_BRUSH = new wxBrush (wxT("WHITE"), wxSOLID);
-    wxBLACK_BRUSH = new wxBrush (wxT("BLACK"), wxSOLID);
-    wxTRANSPARENT_BRUSH = new wxBrush (wxT("BLACK"), wxTRANSPARENT);
-    wxCYAN_BRUSH = new wxBrush (wxT("CYAN"), wxSOLID);
-    wxRED_BRUSH = new wxBrush (wxT("RED"), wxSOLID);
-    wxGREY_BRUSH = new wxBrush (wxT("GREY"), wxSOLID);
-    wxMEDIUM_GREY_BRUSH = new wxBrush (wxT("MEDIUM GREY"), wxSOLID);
-    wxLIGHT_GREY_BRUSH = new wxBrush (wxT("LIGHT GREY"), wxSOLID);
-
-    wxBLACK = new wxColour (wxT("BLACK"));
-    wxWHITE = new wxColour (wxT("WHITE"));
-    wxRED = new wxColour (wxT("RED"));
-    wxBLUE = new wxColour (wxT("BLUE"));
-    wxGREEN = new wxColour (wxT("GREEN"));
-    wxCYAN = new wxColour (wxT("CYAN"));
-    wxLIGHT_GREY = new wxColour (wxT("LIGHT GREY"));
-
-    wxSTANDARD_CURSOR = new wxCursor (wxCURSOR_ARROW);
-    wxHOURGLASS_CURSOR = new wxCursor (wxCURSOR_WAIT);
-    wxCROSS_CURSOR = new wxCursor (wxCURSOR_CROSS);
-}
-
-void wxDeleteStockObjects ()
-{
-    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);
+const wxCursor* wxStockGDI::GetCursor(Item item)
+{
+    wxCursor* cursor = wx_static_cast(wxCursor*, ms_stockObject[item]);
+    if (cursor == NULL)
+    {
+        switch (item)
+        {
+        case CURSOR_CROSS:
+            cursor = new wxCursor(wxCURSOR_CROSS);
+            break;
+        case CURSOR_HOURGLASS:
+            cursor = new wxCursor(wxCURSOR_WAIT);
+            break;
+        case CURSOR_STANDARD:
+            cursor = new wxCursor(wxCURSOR_ARROW);
+            break;
+        default:
+            wxFAIL;
+        }
+        ms_stockObject[item] = cursor;
+    }
+    return cursor;
+}
+
+const wxFont* wxStockGDI::GetFont(Item item)
+{
+    wxFont* font = wx_static_cast(wxFont*, ms_stockObject[item]);
+    if (font == NULL)
+    {
+        switch (item)
+        {
+        case FONT_ITALIC:
+            font = new wxFont(GetFont(FONT_NORMAL)->GetPointSize(), wxROMAN, wxITALIC, wxNORMAL);
+            break;
+        case FONT_NORMAL:
+            font = new wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
+            break;
+        case FONT_SMALL:
+            font = new wxFont(GetFont(FONT_NORMAL)->GetPointSize() - 2, wxSWISS, wxNORMAL, wxNORMAL);
+            break;
+        case FONT_SWISS:
+            font = new wxFont(GetFont(FONT_NORMAL)->GetPointSize(), wxSWISS, wxNORMAL, wxNORMAL);
+            break;
+        default:
+            wxFAIL;
+        }
+        ms_stockObject[item] = font;
+    }
+    return font;
+}
+
+const wxPen* wxStockGDI::GetPen(Item item)
+{
+    wxPen* pen = wx_static_cast(wxPen*, ms_stockObject[item]);
+    if (pen == NULL)
+    {
+        switch (item)
+        {
+        case PEN_BLACK:
+            pen = new wxPen(*GetColour(COLOUR_BLACK), 1, wxSOLID);
+            break;
+        case PEN_BLACKDASHED:
+            pen = new wxPen(*GetColour(COLOUR_BLACK), 1, wxSHORT_DASH);
+            break;
+        case PEN_CYAN:
+            pen = new wxPen(*GetColour(COLOUR_CYAN), 1, wxSOLID);
+            break;
+        case PEN_GREEN:
+            pen = new wxPen(*GetColour(COLOUR_GREEN), 1, wxSOLID);
+            break;
+        case PEN_GREY:
+            pen = new wxPen(wxColour(wxT("GREY")), 1, wxSOLID);
+            break;
+        case PEN_LIGHTGREY:
+            pen = new wxPen(*GetColour(COLOUR_LIGHTGREY), 1, wxSOLID);
+            break;
+        case PEN_MEDIUMGREY:
+            pen = new wxPen(wxColour(wxT("MEDIUM GREY")), 1, wxSOLID);
+            break;
+        case PEN_RED:
+            pen = new wxPen(*GetColour(COLOUR_RED), 1, wxSOLID);
+            break;
+        case PEN_TRANSPARENT:
+            pen = new wxPen(*GetColour(COLOUR_BLACK), 1, wxTRANSPARENT);
+            break;
+        case PEN_WHITE:
+            pen = new wxPen(*GetColour(COLOUR_WHITE), 1, wxSOLID);
+            break;
+        default:
+            wxFAIL;
+        }
+        ms_stockObject[item] = pen;
+    }
+    return pen;
+}
+
+void wxInitializeStockLists()
+{
+    wxTheColourDatabase = new wxColourDatabase;
+
+    wxTheBrushList = new wxBrushList;
+    wxThePenList = new wxPenList;
+    wxTheFontList = new wxFontList;

 }
 
 void wxDeleteStockLists()
 }
 
 void wxDeleteStockLists()


@@ -664,57 +712,30 @@ void wxDeleteStockLists()
     wxDELETE(wxTheBrushList);
     wxDELETE(wxThePenList);
     wxDELETE(wxTheFontList);
     wxDELETE(wxTheBrushList);
     wxDELETE(wxThePenList);
     wxDELETE(wxTheFontList);

-    wxDELETE(wxTheBitmapList);

 }
 
 // ============================================================================
 // wxTheXXXList stuff (semi-obsolete)
 // ============================================================================
 
 }
 
 // ============================================================================
 // wxTheXXXList stuff (semi-obsolete)
 // ============================================================================
 

-wxBitmapList::~wxBitmapList ()
+wxGDIObjListBase::wxGDIObjListBase()

 {
 {

-    wxList::compatibility_iterator node = GetFirst ();
-    while (node)
-    {
-        wxBitmap *bitmap = (wxBitmap *) node->GetData ();
-        wxList::compatibility_iterator next = node->GetNext ();
-        if (bitmap->GetVisible())
-            delete bitmap;
-        node = next;
-    }

 }
 
 }
 

-// Pen and Brush lists
-wxPenList::~wxPenList ()
+wxGDIObjListBase::~wxGDIObjListBase()

 {
 {

-    wxList::compatibility_iterator node = GetFirst ();
-    while (node)
+    for (wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext())

     {
     {

-        wxPen *pen = (wxPen *) node->GetData ();
-        wxList::compatibility_iterator next = node->GetNext ();
-        if (pen->GetVisible())
-            delete pen;
-        node = next;
+        delete wx_static_cast(wxObject*, node->GetData());

     }
 }
 
     }
 }
 

-void wxPenList::AddPen (wxPen * pen)
-{
-    Append (pen);
-}
-
-void wxPenList::RemovePen (wxPen * pen)
-{
-    DeleteObject (pen);
-}
-

 wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, int width, int style)
 {
 wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, int width, int style)
 {

-    for (wxList::compatibility_iterator node = GetFirst (); node; node = node->GetNext ())
+    for (wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext())

     {
         wxPen *each_pen = (wxPen *) node->GetData ();
     {
         wxPen *each_pen = (wxPen *) node->GetData ();

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

                 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 () &&


@@ -723,48 +744,23 @@ wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, int width, int style)
             return each_pen;
     }
 
             return each_pen;
     }
 

-    wxPen *pen = new wxPen (colour, width, style);
-    if ( !pen->Ok() )
+    wxPen* pen = NULL;
+    wxPen penTmp(colour, width, style);
+    if (penTmp.Ok())

     {
     {

-        // don't save the invalid pens in the list
-        delete pen;
-
-        return NULL;
+        pen = new wxPen(penTmp);
+        list.Append(pen);

     }
 
     }
 

-    AddPen(pen);
-
-    // we'll delete it ourselves later
-    pen->SetVisible(true);
-

     return pen;
 }
 
     return pen;
 }
 

-wxBrushList::~wxBrushList ()
-{
-    wxList::compatibility_iterator node = GetFirst ();
-    while (node)
-    {
-        wxBrush *brush = (wxBrush *) node->GetData ();
-        wxList::compatibility_iterator next = node->GetNext ();
-        if (brush && brush->GetVisible())
-            delete brush;
-        node = next;
-    }
-}
-
-void wxBrushList::AddBrush (wxBrush * brush)
-{
-    Append (brush);
-}
-

 wxBrush *wxBrushList::FindOrCreateBrush (const wxColour& colour, int style)
 {
 wxBrush *wxBrushList::FindOrCreateBrush (const wxColour& colour, int style)
 {

-    for (wxList::compatibility_iterator node = GetFirst (); node; node = node->GetNext ())
+    for (wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext())

     {
         wxBrush *each_brush = (wxBrush *) node->GetData ();
     {
         wxBrush *each_brush = (wxBrush *) node->GetData ();

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

                 each_brush->GetStyle () == style &&
                 each_brush->GetColour ().Red () == colour.Red () &&
                 each_brush->GetColour ().Green () == colour.Green () &&
                 each_brush->GetStyle () == style &&
                 each_brush->GetColour ().Red () == colour.Red () &&
                 each_brush->GetColour ().Green () == colour.Green () &&


@@ -772,56 +768,17 @@ wxBrush *wxBrushList::FindOrCreateBrush (const wxColour& colour, int style)
             return each_brush;
     }
 
             return each_brush;
     }
 

-    wxBrush *brush = new wxBrush (colour, style);
-
-    if ( !brush->Ok() )
+    wxBrush* brush = NULL;
+    wxBrush brushTmp(colour, style);
+    if (brushTmp.Ok())

     {
     {

-        // don't put the brushes we failed to create into the list
-        delete brush;
-
-        return NULL;
+        brush = new wxBrush(brushTmp);
+        list.Append(brush);

     }
 
     }
 

-    AddBrush(brush);
-
-    // we'll delete it ourselves later
-    brush->SetVisible(true);
-

     return brush;
 }
 
     return brush;
 }
 

-void wxBrushList::RemoveBrush (wxBrush * brush)
-{
-    DeleteObject (brush);
-}
-
-wxFontList::~wxFontList ()
-{
-    wxList::compatibility_iterator node = GetFirst ();
-    while (node)
-    {
-        // Only delete objects that are 'visible', i.e.
-        // that have been created using FindOrCreate...,
-        // where the pointers are expected to be shared
-        // (and therefore not deleted by any one part of an app).
-        wxFont *font = (wxFont *) node->GetData ();
-        wxList::compatibility_iterator next = node->GetNext ();
-        if (font->GetVisible())
-            delete font;
-        node = next;
-    }
-}
-
-void wxFontList::AddFont (wxFont * font)
-{
-    Append (font);
-}
-
-void wxFontList::RemoveFont (wxFont * font)
-{
-    DeleteObject (font);
-}
-

 wxFont *wxFontList::FindOrCreateFont(int pointSize,
                                      int family,
                                      int style,
 wxFont *wxFontList::FindOrCreateFont(int pointSize,
                                      int family,
                                      int style,


@@ -830,13 +787,12 @@ wxFont *wxFontList::FindOrCreateFont(int pointSize,
                                      const wxString& facename,
                                      wxFontEncoding encoding)
 {
                                      const wxString& facename,
                                      wxFontEncoding encoding)
 {

-    wxFont *font = (wxFont *)NULL;
+    wxFont *font;

     wxList::compatibility_iterator node;
     wxList::compatibility_iterator node;

-    for ( node = GetFirst(); node; node = node->GetNext() )
+    for (node = list.GetFirst(); node; node = node->GetNext())

     {
         font = (wxFont *)node->GetData();
     {
         font = (wxFont *)node->GetData();

-        if ( font->GetVisible() &&
-             font->Ok() &&
+        if (

              font->GetPointSize () == pointSize &&
              font->GetStyle () == style &&
              font->GetWeight () == weight &&
              font->GetPointSize () == pointSize &&
              font->GetStyle () == style &&
              font->GetWeight () == weight &&


@@ -881,30 +837,26 @@ wxFont *wxFontList::FindOrCreateFont(int pointSize,
         }
     }
 
         }
     }
 

-    if ( !node )
+    // font not found, create the new one
+    font = NULL;
+    wxFont fontTmp(pointSize, family, style, weight, underline, facename, encoding);
+    if (fontTmp.Ok())

     {
     {

-        // font not found, create the new one
-        font = new wxFont(pointSize, family, style, weight,
-                          underline, facename, encoding);
-
-        AddFont(font);
-
-        // and mark it as being cacheable
-        font->SetVisible(true);
+        font = new wxFont(fontTmp);
+        list.Append(font);

     }
 
     return font;
 }
 
     }
 
     return font;
 }
 

-void wxBitmapList::AddBitmap(wxBitmap *bitmap)
-{
-    Append(bitmap);
-}
-
-void wxBitmapList::RemoveBitmap(wxBitmap *bitmap)
-{
-    DeleteObject(bitmap);
-}
+#if WXWIN_COMPATIBILITY_2_6
+void wxBrushList::AddBrush(wxBrush*) { }
+void wxBrushList::RemoveBrush(wxBrush*) { }
+void wxFontList::AddFont(wxFont*) { }
+void wxFontList::RemoveFont(wxFont*) { }
+void wxPenList::AddPen(wxPen*) { }
+void wxPenList::RemovePen(wxPen*) { }
+#endif

 
 wxSize wxGetDisplaySize()
 {
 
 wxSize wxGetDisplaySize()
 {


@@ -937,4 +889,3 @@ wxResourceCache::~wxResourceCache ()
         node = node->GetNext ();
     }
 }
         node = node->GetNext ();
     }
 }

-