]> git.saurik.com Git - wxWidgets.git/blame - src/common/gdicmn.cpp
Changed the focus-window event handling back
[wxWidgets.git] / src / common / gdicmn.cpp
CommitLineData
c801d85f
KB
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
8bbe427f 9// Licence: wxWindows licence
c801d85f
KB
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
2432b92d 23#include "wx/event.h"
c801d85f
KB
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"
46ccb510 32#include "wx/app.h"
c801d85f 33
cb38104e 34#include "wx/log.h"
c801d85f
KB
35#include <string.h>
36
2049ba38 37#ifdef __WXMSW__
c801d85f
KB
38#include <windows.h>
39#endif
40
46ccb510
JS
41#ifdef __WXMOTIF__
42#include <Xm/Xm.h>
43#endif
44
c801d85f 45#if !USE_SHARED_LIBRARY
c801d85f
KB
46IMPLEMENT_CLASS(wxColourDatabase, wxList)
47IMPLEMENT_DYNAMIC_CLASS(wxFontList, wxList)
48IMPLEMENT_DYNAMIC_CLASS(wxPenList, wxList)
49IMPLEMENT_DYNAMIC_CLASS(wxBrushList, wxList)
50IMPLEMENT_DYNAMIC_CLASS(wxBitmapList, wxList)
a3622daa 51IMPLEMENT_DYNAMIC_CLASS(wxResourceCache, wxList)
6a6c0a8b
JS
52/*
53IMPLEMENT_DYNAMIC_CLASS(wxRect, wxObject)
c801d85f
KB
54IMPLEMENT_DYNAMIC_CLASS(wxPoint, wxObject)
55IMPLEMENT_DYNAMIC_CLASS(wxRealPoint, wxObject)
6a6c0a8b 56*/
c801d85f
KB
57#endif
58
6a6c0a8b 59wxRect::wxRect()
c801d85f
KB
60{
61 x = 0; y = 0; width = 0; height = 0;
62}
63
debe6624 64wxRect::wxRect(long xx, long yy, long w, long h)
c801d85f
KB
65{
66 x = xx; y = yy; width = w; height = h;
67}
68
69wxRect::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;
8bbe427f 75
c801d85f
KB
76 if (width < 0)
77 {
78 width = -width;
79 x -= width;
80 }
8bbe427f 81
c801d85f
KB
82 if (height < 0)
83 {
84 height = -height;
3e418ffc 85 y -= height;
c801d85f
KB
86 }
87}
88
89wxRect::wxRect(const wxPoint& point, const wxSize& size)
90{
91 x = point.x; y = point.y;
92 width = size.x; height = size.y;
93}
94
95wxRect::wxRect(const wxRect& rect)
96{
8bbe427f
VZ
97 x = rect.x;
98 y = rect.y;
99 width = rect.width;
c801d85f
KB
100 height = rect.height;
101}
102
103wxRect& wxRect::operator = (const wxRect& rect)
104{
105 x = rect.x; y = rect.y; width = rect.width; height = rect.height;
106 return *this;
107}
108
109bool 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
117bool 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
125wxColourDatabase::wxColourDatabase (int type):
126wxList (type)
127{
128}
129
6a6c0a8b 130wxColourDatabase::~wxColourDatabase ()
c801d85f
KB
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
6a6c0a8b 144void wxColourDatabase::Initialize ()
c801d85f
KB
145{
146 // Don't initialize for X: colours are found
147 // in FindColour below.
148 // Added: Not all
8bbe427f 149
c801d85f
KB
150 struct cdef {
151 char *name;
152 int r,g,b;
153 };
154 cdef cc;
155 static cdef table[]={
8bbe427f 156
66bd6b93 157// #ifdef __WXMSW__
c801d85f
KB
158 {"AQUAMARINE",112, 219, 147},
159 {"BLACK",0, 0, 0},
160 {"BLUE", 0, 0, 255},
161 {"BLUE VIOLET", 159, 95, 159},
162 {"BROWN", 165, 42, 42},
163 {"CADET BLUE", 95, 159, 159},
164 {"CORAL", 255, 127, 0},
165 {"CORNFLOWER BLUE", 66, 66, 111},
166 {"CYAN", 0, 255, 255},
167 {"DARK GREY", 47, 47, 47}, // ?
168
169 {"DARK GREEN", 47, 79, 47},
170 {"DARK OLIVE GREEN", 79, 79, 47},
171 {"DARK ORCHID", 153, 50, 204},
172 {"DARK SLATE BLUE", 107, 35, 142},
173 {"DARK SLATE GREY", 47, 79, 79},
174 {"DARK TURQUOISE", 112, 147, 219},
175 {"DIM GREY", 84, 84, 84},
176 {"FIREBRICK", 142, 35, 35},
177 {"FOREST GREEN", 35, 142, 35},
178 {"GOLD", 204, 127, 50},
179 {"GOLDENROD", 219, 219, 112},
180 {"GREY", 128, 128, 128},
181 {"GREEN", 0, 255, 0},
182 {"GREEN YELLOW", 147, 219, 112},
183 {"INDIAN RED", 79, 47, 47},
184 {"KHAKI", 159, 159, 95},
185 {"LIGHT BLUE", 191, 216, 216},
186 {"LIGHT GREY", 192, 192, 192},
187 {"LIGHT STEEL BLUE", 143, 143, 188},
188 {"LIME GREEN", 50, 204, 50},
189 {"LIGHT MAGENTA", 255, 0, 255},
190 {"MAGENTA", 255, 0, 255},
191 {"MAROON", 142, 35, 107},
192 {"MEDIUM AQUAMARINE", 50, 204, 153},
193 {"MEDIUM GREY", 100, 100, 100},
194 {"MEDIUM BLUE", 50, 50, 204},
195 {"MEDIUM FOREST GREEN", 107, 142, 35},
196 {"MEDIUM GOLDENROD", 234, 234, 173},
197 {"MEDIUM ORCHID", 147, 112, 219},
198 {"MEDIUM SEA GREEN", 66, 111, 66},
199 {"MEDIUM SLATE BLUE", 127, 0, 255},
200 {"MEDIUM SPRING GREEN", 127, 255, 0},
201 {"MEDIUM TURQUOISE", 112, 219, 219},
202 {"MEDIUM VIOLET RED", 219, 112, 147},
203 {"MIDNIGHT BLUE", 47, 47, 79},
204 {"NAVY", 35, 35, 142},
205 {"ORANGE", 204, 50, 50},
206 {"ORANGE RED", 255, 0, 127},
207 {"ORCHID", 219, 112, 219},
208 {"PALE GREEN", 143, 188, 143},
209 {"PINK", 188, 143, 234},
210 {"PLUM", 234, 173, 234},
211 {"PURPLE", 176, 0, 255},
212 {"RED", 255, 0, 0},
213 {"SALMON", 111, 66, 66},
214 {"SEA GREEN", 35, 142, 107},
215 {"SIENNA", 142, 107, 35},
216 {"SKY BLUE", 50, 153, 204},
217 {"SLATE BLUE", 0, 127, 255},
218 {"SPRING GREEN", 0, 255, 127},
219 {"STEEL BLUE", 35, 107, 142},
220 {"TAN", 219, 147, 112},
221 {"THISTLE", 216, 191, 216},
222 {"TURQUOISE", 173, 234, 234},
223 {"VIOLET", 79, 47, 79},
224 {"VIOLET RED", 204, 50, 153},
225 {"WHEAT", 216, 216, 191},
226 {"WHITE", 255, 255, 255},
227 {"YELLOW", 255, 255, 0},
228 {"YELLOW GREEN", 153, 204, 50},
66bd6b93 229// #endif
c801d85f 230
2049ba38 231#if defined(__WXGTK__) || defined(__X__)
c801d85f
KB
232 {"MEDIUM GOLDENROD", 234, 234, 173},
233 {"MEDIUM FOREST GREEN", 107, 142, 35},
234 {"LIGHT MAGENTA", 255, 0, 255},
235 {"MEDIUM GREY", 100, 100, 100},
236#endif
8bbe427f 237
c801d85f
KB
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
257wxColour *wxColourDatabase::FindColour(const wxString& colour)
258{
1c4a764c
VZ
259 // VZ: make the comparaison case insensitive
260 wxString str = colour;
261 str.MakeUpper();
262
263 wxNode *node = Find(str);
c801d85f
KB
264 if (node)
265 return (wxColour *)node->Data();
8bbe427f 266
2049ba38 267#ifdef __WXMSW__
c801d85f
KB
268 else return NULL;
269#endif
270
34138703
JS
271// TODO for other implementations. This should really go into
272// platform-specific directories.
169935ad
SC
273#ifdef __WXMAC__
274 else return NULL;
275#endif
34138703
JS
276#ifdef __WXSTUBS__
277 else return NULL;
278#endif
279
2049ba38 280#ifdef __WXGTK__
c801d85f
KB
281 else {
282 wxColour *col = new wxColour( colour );
8bbe427f 283
c801d85f
KB
284 if (!(col->Ok())) {
285 delete col;
c67daf87 286 return (wxColour *) NULL;
c801d85f
KB
287 }
288 Append( colour, col );
289 return col;
290 }
291#endif
292
293#ifdef __X__
294 else {
295 XColor xcolour;
296
2049ba38 297#ifdef __WXMOTIF__
46ccb510 298 Display *display = XtDisplay((Widget) wxTheApp->GetTopLevelWidget()) ;
c801d85f 299#endif
1c4a764c
VZ
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
c801d85f
KB
305
306 /* MATTHEW: [4] Use wxGetMainColormap */
46ccb510 307 if (!XParseColor(display, (Colormap) wxTheApp->GetMainColormap((WXDisplay*) display), colour,&xcolour))
c801d85f
KB
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
322wxString 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 ();
8bbe427f 327
c801d85f
KB
328 for (wxNode * node = First (); node; node = node->Next ())
329 {
330 wxColour *col = (wxColour *) node->Data ();
8bbe427f 331
c801d85f 332 if (col->Red () == red && col->Green () == green && col->Blue () == blue)
8bbe427f
VZ
333 {
334 const char *found = node->GetKeyString();
335 if (found)
336 return wxString(found);
337 }
c801d85f 338 }
8bbe427f 339 return wxString(""); // Not Found
c801d85f
KB
340
341}
342
a3622daa 343void wxInitializeStockLists () {
c801d85f
KB
344 wxTheBrushList = new wxBrushList;
345 wxThePenList = new wxPenList;
346 wxTheFontList = new wxFontList;
347 wxTheBitmapList = new wxBitmapList;
a3622daa 348}
c801d85f 349
a3622daa
VZ
350void wxInitializeStockObjects ()
351{
2049ba38 352#ifdef __WXMOTIF__
c801d85f
KB
353#endif
354#ifdef __X__
46ccb510
JS
355 // TODO
356 // wxFontPool = new XFontPool;
c801d85f
KB
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
8bbe427f 399void wxDeleteStockObjects ()
c801d85f 400{
a3622daa
VZ
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
441void wxDeleteStockLists() {
442 wxDELETE(wxTheBrushList);
443 wxDELETE(wxThePenList);
444 wxDELETE(wxTheFontList);
445 wxDELETE(wxTheBitmapList);
c801d85f
KB
446}
447
6a6c0a8b 448wxBitmapList::wxBitmapList ()
c801d85f
KB
449{
450}
451
6a6c0a8b 452wxBitmapList::~wxBitmapList ()
c801d85f 453{
7fe7d506 454#if defined(__WXMSW__) || defined(__WXMOTIF__)
c801d85f
KB
455 wxNode *node = First ();
456 while (node)
457 {
458 wxBitmap *bitmap = (wxBitmap *) node->Data ();
459 wxNode *next = node->Next ();
4c444f19
JS
460 if (bitmap->GetVisible())
461 delete bitmap;
c801d85f
KB
462 node = next;
463 }
4c444f19 464#endif
c801d85f
KB
465}
466
467// Pen and Brush lists
6a6c0a8b 468wxPenList::~wxPenList ()
c801d85f 469{
7fe7d506 470#if defined(__WXMSW__) || defined(__WXMOTIF__)
c801d85f
KB
471 wxNode *node = First ();
472 while (node)
473 {
474 wxPen *pen = (wxPen *) node->Data ();
475 wxNode *next = node->Next ();
4c444f19
JS
476 if (pen->GetVisible())
477 delete pen;
c801d85f
KB
478 node = next;
479 }
4c444f19 480#endif
c801d85f
KB
481}
482
483void wxPenList::AddPen (wxPen * pen)
484{
485 Append (pen);
486}
487
488void wxPenList::RemovePen (wxPen * pen)
489{
490 DeleteObject (pen);
491}
492
debe6624 493wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, int width, int style)
c801d85f
KB
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() &&
8bbe427f
VZ
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;
c801d85f
KB
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
6a6c0a8b 516wxBrushList::~wxBrushList ()
c801d85f 517{
7fe7d506 518#if defined(__WXMSW__) || defined(__WXMOTIF__)
c801d85f
KB
519 wxNode *node = First ();
520 while (node)
521 {
522 wxBrush *brush = (wxBrush *) node->Data ();
523 wxNode *next = node->Next ();
4c444f19
JS
524 if (brush->GetVisible())
525 delete brush;
c801d85f
KB
526 node = next;
527 }
4c444f19 528#endif
c801d85f
KB
529}
530
531void wxBrushList::AddBrush (wxBrush * brush)
532{
533 Append (brush);
534}
535
debe6624 536wxBrush *wxBrushList::FindOrCreateBrush (const wxColour& colour, int style)
c801d85f
KB
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() &&
8bbe427f
VZ
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;
c801d85f
KB
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
c801d85f
KB
557void wxBrushList::RemoveBrush (wxBrush * brush)
558{
559 DeleteObject (brush);
560}
561
6a6c0a8b 562wxFontList::~wxFontList ()
c801d85f 563{
c801d85f
KB
564 wxNode *node = First ();
565 while (node)
566 {
8bbe427f
VZ
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).
c801d85f
KB
571 wxFont *font = (wxFont *) node->Data ();
572 wxNode *next = node->Next ();
8bbe427f
VZ
573 if (font->GetVisible())
574 delete font;
c801d85f 575 node = next;
4c444f19 576}
c801d85f
KB
577}
578
579void wxFontList::AddFont (wxFont * font)
580{
581 Append (font);
582}
583
584void wxFontList::RemoveFont (wxFont * font)
585{
586 DeleteObject (font);
587}
588
589wxFont *wxFontList::
8bbe427f 590 FindOrCreateFont (int PointSize, int FamilyOrFontId, int Style, int Weight, bool underline, const wxString& Face)
c801d85f
KB
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() &&
8bbe427f
VZ
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 &&
2432b92d 604 ((each_font->GetFaceName() == "") || each_font->GetFaceName() == Face))
8bbe427f
VZ
605 //#endif
606 return each_font;
c801d85f
KB
607 }
608 wxFont *font = new wxFont (PointSize, FamilyOrFontId, Style, Weight, underline, Face);
609 font->SetVisible(TRUE);
610 return font;
611}
612
613void wxBitmapList::AddBitmap(wxBitmap *bitmap)
8bbe427f
VZ
614{
615 Append(bitmap);
616}
617
c801d85f 618void wxBitmapList::RemoveBitmap(wxBitmap *bitmap)
8bbe427f
VZ
619{
620 DeleteObject(bitmap);
621}
c801d85f 622
6a6c0a8b
JS
623wxSize wxGetDisplaySize()
624{
625 int x, y;
626 wxDisplaySize(& x, & y);
627 return wxSize(x, y);
628}
629
8bbe427f
VZ
630wxResourceCache::~wxResourceCache ()
631{
a3622daa
VZ
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