src/common/gdicmn.cpp

   1 /////////////////////////////////////////////////////////////////////////////
   2 // Name:        gdicmn.cpp
   3 // Purpose:     Common GDI classes
   4 // Author:      Julian Smart
   5 // Modified by:
   6 // Created:     01/02/97
   7 // RCS-ID:      $Id$
   8 // Copyright:   (c) Julian Smart and Markus Holzem
   9 // Licence:     wxWindows licence
  10 /////////////////////////////////////////////////////////////////////////////
  11
  12 #ifdef __GNUG__
  13 #pragma implementation "gdicmn.h"
  14 #endif
  15
  16 // For compilers that support precompilation, includes "wx.h".
  17 #include "wx/wxprec.h"
  18
  19 #ifdef __BORLANDC__
  20 #pragma hdrstop
  21 #endif
  22
  23 #include "wx/event.h"
  24 #include "wx/gdicmn.h"
  25 #include "wx/brush.h"
  26 #include "wx/pen.h"
  27 #include "wx/bitmap.h"
  28 #include "wx/icon.h"
  29 #include "wx/cursor.h"
  30 #include "wx/font.h"
  31 #include "wx/palette.h"
  32 #include "wx/app.h"
  33
  34 #include "wx/log.h"
  35 #include <string.h>
  36
  37 #ifdef __WXMSW__
  38 #include <windows.h>
  39 #endif
  40
  41 #ifdef __WXMOTIF__
  42 #include <Xm/Xm.h>
  43 #endif
  44
  45 #if !USE_SHARED_LIBRARY
  46 IMPLEMENT_CLASS(wxColourDatabase, wxList)
  47 IMPLEMENT_DYNAMIC_CLASS(wxFontList, wxList)
  48 IMPLEMENT_DYNAMIC_CLASS(wxPenList, wxList)
  49 IMPLEMENT_DYNAMIC_CLASS(wxBrushList, wxList)
  50 IMPLEMENT_DYNAMIC_CLASS(wxBitmapList, wxList)
  51 IMPLEMENT_DYNAMIC_CLASS(wxResourceCache, wxList)
  52 /*
  53 IMPLEMENT_DYNAMIC_CLASS(wxRect, wxObject)
  54 IMPLEMENT_DYNAMIC_CLASS(wxPoint, wxObject)
  55 IMPLEMENT_DYNAMIC_CLASS(wxRealPoint, wxObject)
  56 */
  57 #endif
  58
  59 wxRect::wxRect()
  60 {
  61     x = 0; y = 0; width = 0; height = 0;
  62 }
  63
  64 wxRect::wxRect(long xx, long yy, long w, long h)
  65 {
  66     x = xx; y = yy; width = w; height = h;
  67 }
  68
  69 wxRect::wxRect(const wxPoint& topLeft, const wxPoint& bottomRight)
  70 {
  71   x = topLeft.x;
  72   y = topLeft.y;
  73   width = bottomRight.x - topLeft.x;
  74   height = bottomRight.y - topLeft.y;
  75
  76   if (width < 0)
  77   {
  78     width = -width;
  79     x -= width;
  80   }
  81
  82   if (height < 0)
  83   {
  84     height = -height;
  85     y -= height;
  86   }
  87 }
  88
  89 wxRect::wxRect(const wxPoint& point, const wxSize& size)
  90 {
  91     x = point.x; y = point.y;
  92     width = size.x; height = size.y;
  93 }
  94
  95 wxRect::wxRect(const wxRect& rect)
  96 {
  97     x = rect.x;
  98     y = rect.y;
  99     width = rect.width;
 100     height = rect.height;
 101 }
 102
 103 wxRect& wxRect::operator = (const wxRect& rect)
 104 {
 105     x = rect.x; y = rect.y; width = rect.width; height = rect.height;
 106     return *this;
 107 }
 108
 109 bool wxRect::operator == (const wxRect& rect)
 110 {
 111   return ((x == rect.x) &&
 112           (y == rect.y) &&
 113           (width == rect.width) &&
 114           (height == rect.height));
 115 }
 116
 117 bool wxRect::operator != (const wxRect& rect)
 118 {
 119   return ((x != rect.x) ||
 120           (y != rect.y) ||
 121           (width != rect.width) ||
 122           (height != rect.height));
 123 }
 124
 125 wxColourDatabase::wxColourDatabase (int type):
 126 wxList (type)
 127 {
 128 }
 129
 130 wxColourDatabase::~wxColourDatabase ()
 131 {
 132   // Cleanup Colour allocated in Initialize()
 133   wxNode *node = First ();
 134   while (node)
 135     {
 136       wxColour *col = (wxColour *) node->Data ();
 137       wxNode *next = node->Next ();
 138       delete col;
 139       node = next;
 140     }
 141 }
 142
 143 // Colour database stuff
 144 void wxColourDatabase::Initialize ()
 145 {
 146   // Don't initialize for X: colours are found
 147   // in FindColour below.
 148   // Added: Not all
 149
 150   struct cdef {
 151    wxChar *name;
 152    int r,g,b;
 153   };
 154   cdef cc;
 155   static cdef table[]={
 156
 157 // #ifdef __WXMSW__
 158    {_T("AQUAMARINE"),112, 219, 147},
 159    {_T("BLACK"),0, 0, 0},
 160    {_T("BLUE"), 0, 0, 255},
 161    {_T("BLUE VIOLET"), 159, 95, 159},
 162    {_T("BROWN"), 165, 42, 42},
 163    {_T("CADET BLUE"), 95, 159, 159},
 164    {_T("CORAL"), 255, 127, 0},
 165    {_T("CORNFLOWER BLUE"), 66, 66, 111},
 166    {_T("CYAN"), 0, 255, 255},
 167    {_T("DARK GREY"), 47, 47, 47},   // ?
 168
 169    {_T("DARK GREEN"), 47, 79, 47},
 170    {_T("DARK OLIVE GREEN"), 79, 79, 47},
 171    {_T("DARK ORCHID"), 153, 50, 204},
 172    {_T("DARK SLATE BLUE"), 107, 35, 142},
 173    {_T("DARK SLATE GREY"), 47, 79, 79},
 174    {_T("DARK TURQUOISE"), 112, 147, 219},
 175    {_T("DIM GREY"), 84, 84, 84},
 176    {_T("FIREBRICK"), 142, 35, 35},
 177    {_T("FOREST GREEN"), 35, 142, 35},
 178    {_T("GOLD"), 204, 127, 50},
 179    {_T("GOLDENROD"), 219, 219, 112},
 180    {_T("GREY"), 128, 128, 128},
 181    {_T("GREEN"), 0, 255, 0},
 182    {_T("GREEN YELLOW"), 147, 219, 112},
 183    {_T("INDIAN RED"), 79, 47, 47},
 184    {_T("KHAKI"), 159, 159, 95},
 185    {_T("LIGHT BLUE"), 191, 216, 216},
 186    {_T("LIGHT GREY"), 192, 192, 192},
 187    {_T("LIGHT STEEL BLUE"), 143, 143, 188},
 188    {_T("LIME GREEN"), 50, 204, 50},
 189    {_T("LIGHT MAGENTA"), 255, 0, 255},
 190    {_T("MAGENTA"), 255, 0, 255},
 191    {_T("MAROON"), 142, 35, 107},
 192    {_T("MEDIUM AQUAMARINE"), 50, 204, 153},
 193    {_T("MEDIUM GREY"), 100, 100, 100},
 194    {_T("MEDIUM BLUE"), 50, 50, 204},
 195    {_T("MEDIUM FOREST GREEN"), 107, 142, 35},
 196    {_T("MEDIUM GOLDENROD"), 234, 234, 173},
 197    {_T("MEDIUM ORCHID"), 147, 112, 219},
 198    {_T("MEDIUM SEA GREEN"), 66, 111, 66},
 199    {_T("MEDIUM SLATE BLUE"), 127, 0, 255},
 200    {_T("MEDIUM SPRING GREEN"), 127, 255, 0},
 201    {_T("MEDIUM TURQUOISE"), 112, 219, 219},
 202    {_T("MEDIUM VIOLET RED"), 219, 112, 147},
 203    {_T("MIDNIGHT BLUE"), 47, 47, 79},
 204    {_T("NAVY"), 35, 35, 142},
 205    {_T("ORANGE"), 204, 50, 50},
 206    {_T("ORANGE RED"), 255, 0, 127},
 207    {_T("ORCHID"), 219, 112, 219},
 208    {_T("PALE GREEN"), 143, 188, 143},
 209    {_T("PINK"), 188, 143, 234},
 210    {_T("PLUM"), 234, 173, 234},
 211    {_T("PURPLE"), 176, 0, 255},
 212    {_T("RED"), 255, 0, 0},
 213    {_T("SALMON"), 111, 66, 66},
 214    {_T("SEA GREEN"), 35, 142, 107},
 215    {_T("SIENNA"), 142, 107, 35},
 216    {_T("SKY BLUE"), 50, 153, 204},
 217    {_T("SLATE BLUE"), 0, 127, 255},
 218    {_T("SPRING GREEN"), 0, 255, 127},
 219    {_T("STEEL BLUE"), 35, 107, 142},
 220    {_T("TAN"), 219, 147, 112},
 221    {_T("THISTLE"), 216, 191, 216},
 222    {_T("TURQUOISE"), 173, 234, 234},
 223    {_T("VIOLET"), 79, 47, 79},
 224    {_T("VIOLET RED"), 204, 50, 153},
 225    {_T("WHEAT"), 216, 216, 191},
 226    {_T("WHITE"), 255, 255, 255},
 227    {_T("YELLOW"), 255, 255, 0},
 228    {_T("YELLOW GREEN"), 153, 204, 50},
 229 // #endif
 230
 231 #if defined(__WXGTK__) || defined(__X__)
 232    {_T("MEDIUM GOLDENROD"), 234, 234, 173},
 233    {_T("MEDIUM FOREST GREEN"), 107, 142, 35},
 234    {_T("LIGHT MAGENTA"), 255, 0, 255},
 235    {_T("MEDIUM GREY"), 100, 100, 100},
 236 #endif
 237
 238    {0,0,0,0}
 239   };
 240   int i;
 241   for (i=0;cc=table[i],cc.name!=0;i++)
 242   {
 243     Append(cc.name,new wxColour(cc.r,cc.g,cc.b));
 244   }
 245
 246 }
 247
 248 /*
 249  * Changed by Ian Brown, July 1994.
 250  *
 251  * When running under X, the Colour Database starts off empty. The X server
 252  * is queried for the colour first time after which it is entered into the
 253  * database. This allows our client to use the server colour database which
 254  * is hopefully gamma corrected for the display being used.
 255  */
 256
 257 wxColour *wxColourDatabase::FindColour(const wxString& colour)
 258 {
 259   // VZ: make the comparaison case insensitive
 260   wxString str = colour;
 261   str.MakeUpper();
 262
 263   wxNode *node = Find(str);
 264   if (node)
 265     return (wxColour *)node->Data();
 266
 267 #ifdef __WXMSW__
 268   else return NULL;
 269 #endif
 270
 271 // TODO for other implementations. This should really go into
 272 // platform-specific directories.
 273 #ifdef __WXMAC__
 274   else return NULL;
 275 #endif
 276 #ifdef __WXSTUBS__
 277   else return NULL;
 278 #endif
 279
 280 #ifdef __WXGTK__
 281   else {
 282     wxColour *col = new wxColour( colour );
 283
 284     if (!(col->Ok())) {
 285       delete col;
 286       return (wxColour *) NULL;
 287     }
 288     Append( colour, col );
 289     return col;
 290   }
 291 #endif
 292
 293 #ifdef __X__
 294   else {
 295     XColor xcolour;
 296
 297 #ifdef __WXMOTIF__
 298     Display *display = XtDisplay((Widget) wxTheApp->GetTopLevelWidget()) ;
 299 #endif
 300 #ifdef __XVIEW__
 301     Xv_Screen screen = xv_get(xview_server, SERVER_NTH_SCREEN, 0);
 302     Xv_opaque root_window = xv_get(screen, XV_ROOT);
 303     Display *display = (Display *)xv_get(root_window, XV_DISPLAY);
 304 #endif
 305
 306     /* MATTHEW: [4] Use wxGetMainColormap */
 307     if (!XParseColor(display, (Colormap) wxTheApp->GetMainColormap((WXDisplay*) display), colour,&xcolour))
 308       return NULL;
 309
 310     unsigned char r = (unsigned char)(xcolour.red >> 8);
 311     unsigned char g = (unsigned char)(xcolour.green >> 8);
 312     unsigned char b = (unsigned char)(xcolour.blue >> 8);
 313
 314     wxColour *col = new wxColour(r, g, b);
 315     Append(colour, col);
 316
 317     return col;
 318   }
 319 #endif
 320 }
 321
 322 wxString wxColourDatabase::FindName (const wxColour& colour) const
 323 {
 324   unsigned char red = colour.Red ();
 325   unsigned char green = colour.Green ();
 326   unsigned char blue = colour.Blue ();
 327
 328   for (wxNode * node = First (); node; node = node->Next ())
 329   {
 330       wxColour *col = (wxColour *) node->Data ();
 331
 332       if (col->Red () == red && col->Green () == green && col->Blue () == blue)
 333         {
 334           const wxChar *found = node->GetKeyString();
 335           if (found)
 336             return wxString(found);
 337         }
 338   }
 339   return wxString("");                        // Not Found
 340
 341 }
 342
 343 void wxInitializeStockLists () {
 344   wxTheBrushList = new wxBrushList;
 345   wxThePenList = new wxPenList;
 346   wxTheFontList = new wxFontList;
 347   wxTheBitmapList = new wxBitmapList;
 348 }
 349
 350 void wxInitializeStockObjects ()
 351 {
 352 #ifdef __WXMOTIF__
 353 #endif
 354 #ifdef __X__
 355   // TODO
 356   //  wxFontPool = new XFontPool;
 357 #endif
 358
 359   wxNORMAL_FONT = new wxFont (12, wxMODERN, wxNORMAL, wxNORMAL);
 360   wxSMALL_FONT = new wxFont (10, wxSWISS, wxNORMAL, wxNORMAL);
 361   wxITALIC_FONT = new wxFont (12, wxROMAN, wxITALIC, wxNORMAL);
 362   wxSWISS_FONT = new wxFont (12, wxSWISS, wxNORMAL, wxNORMAL);
 363
 364   wxRED_PEN = new wxPen ("RED", 1, wxSOLID);
 365   wxCYAN_PEN = new wxPen ("CYAN", 1, wxSOLID);
 366   wxGREEN_PEN = new wxPen ("GREEN", 1, wxSOLID);
 367   wxBLACK_PEN = new wxPen ("BLACK", 1, wxSOLID);
 368   wxWHITE_PEN = new wxPen ("WHITE", 1, wxSOLID);
 369   wxTRANSPARENT_PEN = new wxPen ("BLACK", 1, wxTRANSPARENT);
 370   wxBLACK_DASHED_PEN = new wxPen ("BLACK", 1, wxSHORT_DASH);
 371   wxGREY_PEN = new wxPen ("GREY", 1, wxSOLID);
 372   wxMEDIUM_GREY_PEN = new wxPen ("MEDIUM GREY", 1, wxSOLID);
 373   wxLIGHT_GREY_PEN = new wxPen ("LIGHT GREY", 1, wxSOLID);
 374
 375   wxBLUE_BRUSH = new wxBrush ("BLUE", wxSOLID);
 376   wxGREEN_BRUSH = new wxBrush ("GREEN", wxSOLID);
 377   wxWHITE_BRUSH = new wxBrush ("WHITE", wxSOLID);
 378   wxBLACK_BRUSH = new wxBrush ("BLACK", wxSOLID);
 379   wxTRANSPARENT_BRUSH = new wxBrush ("BLACK", wxTRANSPARENT);
 380   wxCYAN_BRUSH = new wxBrush ("CYAN", wxSOLID);
 381   wxRED_BRUSH = new wxBrush ("RED", wxSOLID);
 382   wxGREY_BRUSH = new wxBrush ("GREY", wxSOLID);
 383   wxMEDIUM_GREY_BRUSH = new wxBrush ("MEDIUM GREY", wxSOLID);
 384   wxLIGHT_GREY_BRUSH = new wxBrush ("LIGHT GREY", wxSOLID);
 385
 386   wxBLACK = new wxColour ("BLACK");
 387   wxWHITE = new wxColour ("WHITE");
 388   wxRED = new wxColour ("RED");
 389   wxBLUE = new wxColour ("BLUE");
 390   wxGREEN = new wxColour ("GREEN");
 391   wxCYAN = new wxColour ("CYAN");
 392   wxLIGHT_GREY = new wxColour ("LIGHT GREY");
 393
 394   wxSTANDARD_CURSOR = new wxCursor (wxCURSOR_ARROW);
 395   wxHOURGLASS_CURSOR = new wxCursor (wxCURSOR_WAIT);
 396   wxCROSS_CURSOR = new wxCursor (wxCURSOR_CROSS);
 397 }
 398
 399 void wxDeleteStockObjects ()
 400 {
 401   wxDELETE(wxNORMAL_FONT);
 402   wxDELETE(wxSMALL_FONT);
 403   wxDELETE(wxITALIC_FONT);
 404   wxDELETE(wxSWISS_FONT);
 405
 406   wxDELETE(wxRED_PEN);
 407   wxDELETE(wxCYAN_PEN);
 408   wxDELETE(wxGREEN_PEN);
 409   wxDELETE(wxBLACK_PEN);
 410   wxDELETE(wxWHITE_PEN);
 411   wxDELETE(wxTRANSPARENT_PEN);
 412   wxDELETE(wxBLACK_DASHED_PEN);
 413   wxDELETE(wxGREY_PEN);
 414   wxDELETE(wxMEDIUM_GREY_PEN);
 415   wxDELETE(wxLIGHT_GREY_PEN);
 416
 417   wxDELETE(wxBLUE_BRUSH);
 418   wxDELETE(wxGREEN_BRUSH);
 419   wxDELETE(wxWHITE_BRUSH);
 420   wxDELETE(wxBLACK_BRUSH);
 421   wxDELETE(wxTRANSPARENT_BRUSH);
 422   wxDELETE(wxCYAN_BRUSH);
 423   wxDELETE(wxRED_BRUSH);
 424   wxDELETE(wxGREY_BRUSH);
 425   wxDELETE(wxMEDIUM_GREY_BRUSH);
 426   wxDELETE(wxLIGHT_GREY_BRUSH);
 427
 428   wxDELETE(wxBLACK);
 429   wxDELETE(wxWHITE);
 430   wxDELETE(wxRED);
 431   wxDELETE(wxBLUE);
 432   wxDELETE(wxGREEN);
 433   wxDELETE(wxCYAN);
 434   wxDELETE(wxLIGHT_GREY);
 435
 436   wxDELETE(wxSTANDARD_CURSOR);
 437   wxDELETE(wxHOURGLASS_CURSOR);
 438   wxDELETE(wxCROSS_CURSOR);
 439 }
 440
 441 void wxDeleteStockLists() {
 442   wxDELETE(wxTheBrushList);
 443   wxDELETE(wxThePenList);
 444   wxDELETE(wxTheFontList);
 445   wxDELETE(wxTheBitmapList);
 446 }
 447
 448 wxBitmapList::wxBitmapList ()
 449 {
 450 }
 451
 452 wxBitmapList::~wxBitmapList ()
 453 {
 454 #if defined(__WXMSW__) || defined(__WXMOTIF__)
 455   wxNode *node = First ();
 456   while (node)
 457     {
 458       wxBitmap *bitmap = (wxBitmap *) node->Data ();
 459       wxNode *next = node->Next ();
 460       if (bitmap->GetVisible())
 461         delete bitmap;
 462       node = next;
 463     }
 464 #endif
 465 }
 466
 467 // Pen and Brush lists
 468 wxPenList::~wxPenList ()
 469 {
 470 #if defined(__WXMSW__) || defined(__WXMOTIF__)
 471   wxNode *node = First ();
 472   while (node)
 473     {
 474       wxPen *pen = (wxPen *) node->Data ();
 475       wxNode *next = node->Next ();
 476       if (pen->GetVisible())
 477         delete pen;
 478       node = next;
 479     }
 480 #endif
 481 }
 482
 483 void wxPenList::AddPen (wxPen * pen)
 484 {
 485   Append (pen);
 486 }
 487
 488 void wxPenList::RemovePen (wxPen * pen)
 489 {
 490   DeleteObject (pen);
 491 }
 492
 493 wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, int width, int style)
 494 {
 495   for (wxNode * node = First (); node; node = node->Next ())
 496     {
 497       wxPen *each_pen = (wxPen *) node->Data ();
 498       if (each_pen && each_pen->GetVisible() &&
 499           each_pen->GetWidth () == width &&
 500           each_pen->GetStyle () == style &&
 501           each_pen->GetColour ().Red () == colour.Red () &&
 502           each_pen->GetColour ().Green () == colour.Green () &&
 503           each_pen->GetColour ().Blue () == colour.Blue ())
 504         return each_pen;
 505     }
 506   wxPen *pen = new wxPen (colour, width, style);
 507
 508   // Yes, we can return a pointer to this in a later FindOrCreatePen call,
 509   // because we created it within FindOrCreatePen. Safeguards against
 510   // returning a pointer to an automatic variable and hanging on to it
 511   // (dangling pointer).
 512   pen->SetVisible(TRUE);
 513   return pen;
 514 }
 515
 516 wxBrushList::~wxBrushList ()
 517 {
 518 #if defined(__WXMSW__) || defined(__WXMOTIF__)
 519   wxNode *node = First ();
 520   while (node)
 521     {
 522       wxBrush *brush = (wxBrush *) node->Data ();
 523       wxNode *next = node->Next ();
 524       if (brush->GetVisible())
 525         delete brush;
 526       node = next;
 527     }
 528 #endif
 529 }
 530
 531 void wxBrushList::AddBrush (wxBrush * brush)
 532 {
 533   Append (brush);
 534 }
 535
 536 wxBrush *wxBrushList::FindOrCreateBrush (const wxColour& colour, int style)
 537 {
 538   for (wxNode * node = First (); node; node = node->Next ())
 539     {
 540       wxBrush *each_brush = (wxBrush *) node->Data ();
 541       if (each_brush && each_brush->GetVisible() &&
 542           each_brush->GetStyle () == style &&
 543           each_brush->GetColour ().Red () == colour.Red () &&
 544           each_brush->GetColour ().Green () == colour.Green () &&
 545           each_brush->GetColour ().Blue () == colour.Blue ())
 546         return each_brush;
 547     }
 548   // Yes, we can return a pointer to this in a later FindOrCreateBrush call,
 549   // because we created it within FindOrCreateBrush. Safeguards against
 550   // returning a pointer to an automatic variable and hanging on to it
 551   // (dangling pointer).
 552   wxBrush *brush = new wxBrush (colour, style);
 553   brush->SetVisible(TRUE);
 554   return brush;
 555 }
 556
 557 void wxBrushList::RemoveBrush (wxBrush * brush)
 558 {
 559   DeleteObject (brush);
 560 }
 561
 562 wxFontList::~wxFontList ()
 563 {
 564   wxNode *node = First ();
 565   while (node)
 566     {
 567           // Only delete objects that are 'visible', i.e.
 568           // that have been created using FindOrCreate...,
 569           // where the pointers are expected to be shared
 570           // (and therefore not deleted by any one part of an app).
 571       wxFont *font = (wxFont *) node->Data ();
 572       wxNode *next = node->Next ();
 573           if (font->GetVisible())
 574                 delete font;
 575       node = next;
 576 }
 577 }
 578
 579 void wxFontList::AddFont (wxFont * font)
 580 {
 581   Append (font);
 582 }
 583
 584 void wxFontList::RemoveFont (wxFont * font)
 585 {
 586   DeleteObject (font);
 587 }
 588
 589 wxFont *wxFontList::
 590         FindOrCreateFont (int PointSize, int FamilyOrFontId, int Style, int Weight, bool underline, const wxString& Face)
 591 {
 592   for (wxNode * node = First (); node; node = node->Next ())
 593     {
 594       wxFont *each_font = (wxFont *) node->Data ();
 595       if (each_font && each_font->GetVisible() && each_font->Ok() &&
 596           each_font->GetPointSize () == PointSize &&
 597           each_font->GetStyle () == Style &&
 598           each_font->GetWeight () == Weight &&
 599           each_font->GetUnderlined () == underline &&
 600           //#if defined(__X__)
 601           //          each_font->GetFontId () == FamilyOrFontId) /* New font system */
 602           //#else
 603           each_font->GetFamily () == FamilyOrFontId &&
 604           ((each_font->GetFaceName() == _T("")) || each_font->GetFaceName() == Face))
 605         //#endif
 606         return each_font;
 607     }
 608   wxFont *font = new wxFont (PointSize, FamilyOrFontId, Style, Weight, underline, Face);
 609   font->SetVisible(TRUE);
 610   return font;
 611 }
 612
 613 void wxBitmapList::AddBitmap(wxBitmap *bitmap)
 614 {
 615     Append(bitmap);
 616 }
 617
 618 void wxBitmapList::RemoveBitmap(wxBitmap *bitmap)
 619 {
 620     DeleteObject(bitmap);
 621 }
 622
 623 wxSize wxGetDisplaySize()
 624 {
 625     int x, y;
 626     wxDisplaySize(& x, & y);
 627     return wxSize(x, y);
 628 }
 629
 630 wxResourceCache::~wxResourceCache ()
 631 {
 632   wxNode *node = First ();
 633   while (node) {
 634     wxGDIObject *item = (wxGDIObject *)node->Data();
 635     if (item->IsKindOf(CLASSINFO(wxBrush))) {
 636       wxBrush *brush = (wxBrush *)item;
 637       delete brush;
 638     }
 639
 640     if (item->IsKindOf(CLASSINFO(wxFont))) {
 641       wxFont *font = (wxFont *)item;
 642       delete font;
 643     }
 644
 645     if (item->IsKindOf(CLASSINFO(wxBitmap))) {
 646       wxBitmap *bitmap = (wxBitmap *)item;
 647       delete bitmap;
 648     }
 649
 650     if (item->IsKindOf(CLASSINFO(wxColour))) {
 651       wxColour *colour = (wxColour *)item;
 652       delete colour;
 653     }
 654
 655     wxNode *next = node->Next ();
 656     node = next;
 657   }
 658 }
 659