1 /////////////////////////////////////////////////////////////////////////////
2 // Name: src/common/gdicmn.cpp
3 // Purpose: Common GDI classes
4 // Author: Julian Smart
8 // Copyright: (c) Julian Smart
9 // Licence: wxWindows licence
10 /////////////////////////////////////////////////////////////////////////////
12 // For compilers that support precompilation, includes "wx.h".
13 #include "wx/wxprec.h"
19 #include "wx/gdicmn.h"
20 #include "wx/gdiobj.h"
26 #include "wx/palette.h"
28 #include "wx/iconbndl.h"
29 #include "wx/cursor.h"
30 #include "wx/settings.h"
31 #include "wx/bitmap.h"
32 #include "wx/colour.h"
38 IMPLEMENT_ABSTRACT_CLASS(wxGDIObject
, wxObject
)
41 WXDLLIMPEXP_DATA_CORE(wxBrushList
*) wxTheBrushList
;
42 WXDLLIMPEXP_DATA_CORE(wxFontList
*) wxTheFontList
;
43 WXDLLIMPEXP_DATA_CORE(wxPenList
*) wxThePenList
;
45 WXDLLIMPEXP_DATA_CORE(wxColourDatabase
*) wxTheColourDatabase
;
47 WXDLLIMPEXP_DATA_CORE(wxBitmap
) wxNullBitmap
;
48 WXDLLIMPEXP_DATA_CORE(wxBrush
) wxNullBrush
;
49 WXDLLIMPEXP_DATA_CORE(wxColour
) wxNullColour
;
50 WXDLLIMPEXP_DATA_CORE(wxCursor
) wxNullCursor
;
51 WXDLLIMPEXP_DATA_CORE(wxFont
) wxNullFont
;
52 WXDLLIMPEXP_DATA_CORE(wxIcon
) wxNullIcon
;
53 WXDLLIMPEXP_DATA_CORE(wxPen
) wxNullPen
;
55 WXDLLIMPEXP_DATA_CORE(wxPalette
) wxNullPalette
;
57 WXDLLIMPEXP_DATA_CORE(wxIconBundle
) wxNullIconBundle
;
59 const wxSize
wxDefaultSize(wxDefaultCoord
, wxDefaultCoord
);
60 const wxPoint
wxDefaultPosition(wxDefaultCoord
, wxDefaultCoord
);
62 #include "wx/listimpl.cpp"
63 WX_DEFINE_LIST(wxPointList
)
66 #if wxUSE_EXTENDED_RTTI
70 template<> void wxStringReadValue(const wxString
&s
, wxPoint
&data
)
72 wxSscanf(s
, wxT("%d,%d"), &data
.x
, &data
.y
) ;
75 template<> void wxStringWriteValue(wxString
&s
, const wxPoint
&data
)
77 s
= wxString::Format(wxT("%d,%d"), data
.x
, data
.y
) ;
80 wxCUSTOM_TYPE_INFO(wxPoint
, wxToStringConverter
<wxPoint
> , wxFromStringConverter
<wxPoint
>)
82 template<> void wxStringReadValue(const wxString
&s
, wxSize
&data
)
84 wxSscanf(s
, wxT("%d,%d"), &data
.x
, &data
.y
) ;
87 template<> void wxStringWriteValue(wxString
&s
, const wxSize
&data
)
89 s
= wxString::Format(wxT("%d,%d"), data
.x
, data
.y
) ;
92 wxCUSTOM_TYPE_INFO(wxSize
, wxToStringConverter
<wxSize
> , wxFromStringConverter
<wxSize
>)
96 wxRect::wxRect(const wxPoint
& point1
, const wxPoint
& point2
)
100 width
= point2
.x
- point1
.x
;
101 height
= point2
.y
- point1
.y
;
118 wxRect
& wxRect::Union(const wxRect
& rect
)
120 // ignore empty rectangles: union with an empty rectangle shouldn't extend
121 // this one to (0, 0)
122 if ( !width
|| !height
)
126 else if ( rect
.width
&& rect
.height
)
128 int x1
= wxMin(x
, rect
.x
);
129 int y1
= wxMin(y
, rect
.y
);
130 int y2
= wxMax(y
+ height
, rect
.height
+ rect
.y
);
131 int x2
= wxMax(x
+ width
, rect
.width
+ rect
.x
);
138 //else: we're not empty and rect is empty
143 wxRect
& wxRect::Inflate(wxCoord dx
, wxCoord dy
)
147 // Don't allow deflate to eat more width than we have,
148 // a well-defined rectangle cannot have negative width.
154 // The inflate is valid.
161 // Don't allow deflate to eat more height than we have,
162 // a well-defined rectangle cannot have negative height.
168 // The inflate is valid.
176 bool wxRect::Contains(int cx
, int cy
) const
178 return ( (cx
>= x
) && (cy
>= y
)
179 && ((cy
- y
) < height
)
180 && ((cx
- x
) < width
)
184 bool wxRect::Contains(const wxRect
& rect
) const
186 return Contains(rect
.GetTopLeft()) && Contains(rect
.GetBottomRight());
189 wxRect
& wxRect::Intersect(const wxRect
& rect
)
198 if ( x2
> rect
.GetRight() )
199 x2
= rect
.GetRight();
200 if ( y2
> rect
.GetBottom() )
201 y2
= rect
.GetBottom();
206 if ( width
<= 0 || height
<= 0 )
215 bool wxRect::Intersects(const wxRect
& rect
) const
217 wxRect r
= Intersect(rect
);
219 // if there is no intersection, both width and height are 0
223 wxRect
& wxRect::operator+=(const wxRect
& rect
)
225 *this = *this + rect
;
230 wxRect
& wxRect::operator*=(const wxRect
& rect
)
232 *this = *this * rect
;
237 wxRect
operator+(const wxRect
& r1
, const wxRect
& r2
)
239 int x1
= wxMin(r1
.x
, r2
.x
);
240 int y1
= wxMin(r1
.y
, r2
.y
);
241 int y2
= wxMax(r1
.y
+r1
.height
, r2
.height
+r2
.y
);
242 int x2
= wxMax(r1
.x
+r1
.width
, r2
.width
+r2
.x
);
243 return wxRect(x1
, y1
, x2
-x1
, y2
-y1
);
246 wxRect
operator*(const wxRect
& r1
, const wxRect
& r2
)
248 int x1
= wxMax(r1
.x
, r2
.x
);
249 int y1
= wxMax(r1
.y
, r2
.y
);
250 int y2
= wxMin(r1
.y
+r1
.height
, r2
.height
+r2
.y
);
251 int x2
= wxMin(r1
.x
+r1
.width
, r2
.width
+r2
.x
);
252 return wxRect(x1
, y1
, x2
-x1
, y2
-y1
);
255 wxRealPoint::wxRealPoint(const wxPoint
& pt
)
260 // ============================================================================
262 // ============================================================================
264 // ----------------------------------------------------------------------------
265 // wxColourDatabase ctor/dtor
266 // ----------------------------------------------------------------------------
268 wxColourDatabase::wxColourDatabase ()
270 // will be created on demand in Initialize()
274 wxColourDatabase::~wxColourDatabase ()
278 WX_CLEAR_HASH_MAP(wxStringToColourHashMap
, *m_map
);
284 delete [] m_palTable
;
288 // Colour database stuff
289 void wxColourDatabase::Initialize()
293 // already initialized
297 m_map
= new wxStringToColourHashMap
;
299 static const struct wxColourDesc
306 {wxT("AQUAMARINE"),112, 219, 147},
307 {wxT("BLACK"),0, 0, 0},
308 {wxT("BLUE"), 0, 0, 255},
309 {wxT("BLUE VIOLET"), 159, 95, 159},
310 {wxT("BROWN"), 165, 42, 42},
311 {wxT("CADET BLUE"), 95, 159, 159},
312 {wxT("CORAL"), 255, 127, 0},
313 {wxT("CORNFLOWER BLUE"), 66, 66, 111},
314 {wxT("CYAN"), 0, 255, 255},
315 {wxT("DARK GREY"), 47, 47, 47}, // ?
317 {wxT("DARK GREEN"), 47, 79, 47},
318 {wxT("DARK OLIVE GREEN"), 79, 79, 47},
319 {wxT("DARK ORCHID"), 153, 50, 204},
320 {wxT("DARK SLATE BLUE"), 107, 35, 142},
321 {wxT("DARK SLATE GREY"), 47, 79, 79},
322 {wxT("DARK TURQUOISE"), 112, 147, 219},
323 {wxT("DIM GREY"), 84, 84, 84},
324 {wxT("FIREBRICK"), 142, 35, 35},
325 {wxT("FOREST GREEN"), 35, 142, 35},
326 {wxT("GOLD"), 204, 127, 50},
327 {wxT("GOLDENROD"), 219, 219, 112},
328 {wxT("GREY"), 128, 128, 128},
329 {wxT("GREEN"), 0, 255, 0},
330 {wxT("GREEN YELLOW"), 147, 219, 112},
331 {wxT("INDIAN RED"), 79, 47, 47},
332 {wxT("KHAKI"), 159, 159, 95},
333 {wxT("LIGHT BLUE"), 191, 216, 216},
334 {wxT("LIGHT GREY"), 192, 192, 192},
335 {wxT("LIGHT STEEL BLUE"), 143, 143, 188},
336 {wxT("LIME GREEN"), 50, 204, 50},
337 {wxT("LIGHT MAGENTA"), 255, 0, 255},
338 {wxT("MAGENTA"), 255, 0, 255},
339 {wxT("MAROON"), 142, 35, 107},
340 {wxT("MEDIUM AQUAMARINE"), 50, 204, 153},
341 {wxT("MEDIUM GREY"), 100, 100, 100},
342 {wxT("MEDIUM BLUE"), 50, 50, 204},
343 {wxT("MEDIUM FOREST GREEN"), 107, 142, 35},
344 {wxT("MEDIUM GOLDENROD"), 234, 234, 173},
345 {wxT("MEDIUM ORCHID"), 147, 112, 219},
346 {wxT("MEDIUM SEA GREEN"), 66, 111, 66},
347 {wxT("MEDIUM SLATE BLUE"), 127, 0, 255},
348 {wxT("MEDIUM SPRING GREEN"), 127, 255, 0},
349 {wxT("MEDIUM TURQUOISE"), 112, 219, 219},
350 {wxT("MEDIUM VIOLET RED"), 219, 112, 147},
351 {wxT("MIDNIGHT BLUE"), 47, 47, 79},
352 {wxT("NAVY"), 35, 35, 142},
353 {wxT("ORANGE"), 204, 50, 50},
354 {wxT("ORANGE RED"), 255, 0, 127},
355 {wxT("ORCHID"), 219, 112, 219},
356 {wxT("PALE GREEN"), 143, 188, 143},
357 {wxT("PINK"), 255, 192, 203},
358 {wxT("PLUM"), 234, 173, 234},
359 {wxT("PURPLE"), 176, 0, 255},
360 {wxT("RED"), 255, 0, 0},
361 {wxT("SALMON"), 111, 66, 66},
362 {wxT("SEA GREEN"), 35, 142, 107},
363 {wxT("SIENNA"), 142, 107, 35},
364 {wxT("SKY BLUE"), 50, 153, 204},
365 {wxT("SLATE BLUE"), 0, 127, 255},
366 {wxT("SPRING GREEN"), 0, 255, 127},
367 {wxT("STEEL BLUE"), 35, 107, 142},
368 {wxT("TAN"), 219, 147, 112},
369 {wxT("THISTLE"), 216, 191, 216},
370 {wxT("TURQUOISE"), 173, 234, 234},
371 {wxT("VIOLET"), 79, 47, 79},
372 {wxT("VIOLET RED"), 204, 50, 153},
373 {wxT("WHEAT"), 216, 216, 191},
374 {wxT("WHITE"), 255, 255, 255},
375 {wxT("YELLOW"), 255, 255, 0},
376 {wxT("YELLOW GREEN"), 153, 204, 50}
381 for ( n
= 0; n
< WXSIZEOF(wxColourTable
); n
++ )
383 const wxColourDesc
& cc
= wxColourTable
[n
];
384 (*m_map
)[cc
.name
] = new wxColour(cc
.r
, cc
.g
, cc
.b
);
388 m_palTable
= new long[n
];
389 for ( n
= 0; n
< WXSIZEOF(wxColourTable
); n
++ )
391 const wxColourDesc
& cc
= wxColourTable
[n
];
392 m_palTable
[n
] = OS2RGB(cc
.r
,cc
.g
,cc
.b
);
398 // ----------------------------------------------------------------------------
399 // wxColourDatabase operations
400 // ----------------------------------------------------------------------------
402 void wxColourDatabase::AddColour(const wxString
& name
, const wxColour
& colour
)
406 // canonicalize the colour names before using them as keys: they should be
408 wxString colName
= name
;
411 // ... and we also allow both grey/gray
412 wxString colNameAlt
= colName
;
413 if ( !colNameAlt
.Replace(wxT("GRAY"), wxT("GREY")) )
415 // but in this case it is not necessary so avoid extra search below
419 wxStringToColourHashMap::iterator it
= m_map
->find(colName
);
420 if ( it
== m_map
->end() && !colNameAlt
.empty() )
421 it
= m_map
->find(colNameAlt
);
422 if ( it
!= m_map
->end() )
424 *(it
->second
) = colour
;
428 (*m_map
)[colName
] = new wxColour(colour
);
432 wxColour
wxColourDatabase::Find(const wxString
& colour
) const
434 wxColourDatabase
* const self
= wxConstCast(this, wxColourDatabase
);
437 // make the comparaison case insensitive and also match both grey and gray
438 wxString colName
= colour
;
440 wxString colNameAlt
= colName
;
441 if ( !colNameAlt
.Replace(wxT("GRAY"), wxT("GREY")) )
444 wxStringToColourHashMap::iterator it
= m_map
->find(colName
);
445 if ( it
== m_map
->end() && !colNameAlt
.empty() )
446 it
= m_map
->find(colNameAlt
);
447 if ( it
!= m_map
->end() )
448 return *(it
->second
);
450 // we did not find any result in existing colours:
451 // we won't use wxString -> wxColour conversion because the
452 // wxColour::Set(const wxString &) function which does that conversion
453 // internally uses this function (wxColourDatabase::Find) and we want
454 // to avoid infinite recursion !
458 wxString
wxColourDatabase::FindName(const wxColour
& colour
) const
460 wxColourDatabase
* const self
= wxConstCast(this, wxColourDatabase
);
463 typedef wxStringToColourHashMap::iterator iterator
;
465 for ( iterator it
= m_map
->begin(), en
= m_map
->end(); it
!= en
; ++it
)
467 if ( *(it
->second
) == colour
)
471 return wxEmptyString
;
474 // ----------------------------------------------------------------------------
475 // deprecated wxColourDatabase methods
476 // ----------------------------------------------------------------------------
478 #if WXWIN_COMPATIBILITY_2_6
479 wxColour
*wxColourDatabase::FindColour(const wxString
& name
)
481 // This function is deprecated, use Find() instead.
482 // Formerly this function sometimes would return a deletable pointer and
483 // sometimes a non-deletable one (when returning a colour from the database).
484 // Trying to delete the latter anyway results in problems, so probably
485 // nobody ever freed the pointers. Currently it always returns a new
486 // instance, which means there will be memory leaks.
487 wxLogDebug(wxT("wxColourDataBase::FindColour():")
488 wxT(" Please use wxColourDataBase::Find() instead"));
490 // using a static variable here is not the most elegant solution but unless
491 // we want to make wxStringToColourHashMap public (i.e. move it to the
492 // header) so that we could have a member function returning
493 // wxStringToColourHashMap::iterator, there is really no good way to do it
496 // and knowing that this function is going to disappear in the next release
497 // anyhow I don't want to waste time on this
499 static wxColour s_col
;
505 return new wxColour(s_col
);
507 #endif // WXWIN_COMPATIBILITY_2_6
509 // ============================================================================
511 // ============================================================================
513 static wxStockGDI gs_wxStockGDI_instance
;
514 wxStockGDI
* wxStockGDI::ms_instance
= &gs_wxStockGDI_instance
;
515 wxObject
* wxStockGDI::ms_stockObject
[ITEMCOUNT
];
517 wxStockGDI::wxStockGDI()
521 wxStockGDI::~wxStockGDI()
525 void wxStockGDI::DeleteAll()
527 for (unsigned i
= 0; i
< ITEMCOUNT
; i
++)
529 wxDELETE(ms_stockObject
[i
]);
533 const wxBrush
* wxStockGDI::GetBrush(Item item
)
535 wxBrush
* brush
= static_cast<wxBrush
*>(ms_stockObject
[item
]);
541 brush
= new wxBrush(*GetColour(COLOUR_BLACK
), wxBRUSHSTYLE_SOLID
);
544 brush
= new wxBrush(*GetColour(COLOUR_BLUE
), wxBRUSHSTYLE_SOLID
);
547 brush
= new wxBrush(*GetColour(COLOUR_CYAN
), wxBRUSHSTYLE_SOLID
);
550 brush
= new wxBrush(*GetColour(COLOUR_GREEN
), wxBRUSHSTYLE_SOLID
);
553 brush
= new wxBrush(*GetColour(COLOUR_YELLOW
), wxBRUSHSTYLE_SOLID
);
556 brush
= new wxBrush(wxColour(wxT("GREY")), wxBRUSHSTYLE_SOLID
);
558 case BRUSH_LIGHTGREY
:
559 brush
= new wxBrush(*GetColour(COLOUR_LIGHTGREY
), wxBRUSHSTYLE_SOLID
);
561 case BRUSH_MEDIUMGREY
:
562 brush
= new wxBrush(wxColour(wxT("MEDIUM GREY")), wxBRUSHSTYLE_SOLID
);
565 brush
= new wxBrush(*GetColour(COLOUR_RED
), wxBRUSHSTYLE_SOLID
);
567 case BRUSH_TRANSPARENT
:
568 brush
= new wxBrush(*GetColour(COLOUR_BLACK
), wxBRUSHSTYLE_TRANSPARENT
);
571 brush
= new wxBrush(*GetColour(COLOUR_WHITE
), wxBRUSHSTYLE_SOLID
);
576 ms_stockObject
[item
] = brush
;
581 const wxColour
* wxStockGDI::GetColour(Item item
)
583 wxColour
* colour
= static_cast<wxColour
*>(ms_stockObject
[item
]);
589 colour
= new wxColour(0, 0, 0);
592 colour
= new wxColour(0, 0, 255);
595 colour
= new wxColour(wxT("CYAN"));
598 colour
= new wxColour(0, 255, 0);
601 colour
= new wxColour(255, 255, 0);
603 case COLOUR_LIGHTGREY
:
604 colour
= new wxColour(wxT("LIGHT GREY"));
607 colour
= new wxColour(255, 0, 0);
610 colour
= new wxColour(255, 255, 255);
615 ms_stockObject
[item
] = colour
;
620 const wxCursor
* wxStockGDI::GetCursor(Item item
)
622 wxCursor
* cursor
= static_cast<wxCursor
*>(ms_stockObject
[item
]);
628 cursor
= new wxCursor(wxCURSOR_CROSS
);
630 case CURSOR_HOURGLASS
:
631 cursor
= new wxCursor(wxCURSOR_WAIT
);
633 case CURSOR_STANDARD
:
634 cursor
= new wxCursor(wxCURSOR_ARROW
);
639 ms_stockObject
[item
] = cursor
;
644 const wxFont
* wxStockGDI::GetFont(Item item
)
646 wxFont
* font
= static_cast<wxFont
*>(ms_stockObject
[item
]);
652 font
= new wxFont(GetFont(FONT_NORMAL
)->GetPointSize(), wxROMAN
, wxITALIC
, wxNORMAL
);
655 font
= new wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT
));
658 font
= new wxFont(GetFont(FONT_NORMAL
)->GetPointSize()
659 // Using the font 2 points smaller than the normal one
660 // results in font so small as to be unreadable under MSW.
661 // We might want to actually use -1 under the other
662 // platforms too but for now be conservative and keep -2
663 // there for compatibility with the old behaviour as the
664 // small font seems to be readable enough there as it is.
670 wxSWISS
, wxNORMAL
, wxNORMAL
);
673 font
= new wxFont(GetFont(FONT_NORMAL
)->GetPointSize(), wxSWISS
, wxNORMAL
, wxNORMAL
);
678 ms_stockObject
[item
] = font
;
683 const wxPen
* wxStockGDI::GetPen(Item item
)
685 wxPen
* pen
= static_cast<wxPen
*>(ms_stockObject
[item
]);
691 pen
= new wxPen(*GetColour(COLOUR_BLACK
), 1, wxPENSTYLE_SOLID
);
693 case PEN_BLACKDASHED
:
694 pen
= new wxPen(*GetColour(COLOUR_BLACK
), 1, wxPENSTYLE_SHORT_DASH
);
697 pen
= new wxPen(*GetColour(COLOUR_BLUE
), 1, wxPENSTYLE_SOLID
);
700 pen
= new wxPen(*GetColour(COLOUR_CYAN
), 1, wxPENSTYLE_SOLID
);
703 pen
= new wxPen(*GetColour(COLOUR_GREEN
), 1, wxPENSTYLE_SOLID
);
706 pen
= new wxPen(*GetColour(COLOUR_YELLOW
), 1, wxPENSTYLE_SOLID
);
709 pen
= new wxPen(wxColour(wxT("GREY")), 1, wxPENSTYLE_SOLID
);
712 pen
= new wxPen(*GetColour(COLOUR_LIGHTGREY
), 1, wxPENSTYLE_SOLID
);
715 pen
= new wxPen(wxColour(wxT("MEDIUM GREY")), 1, wxPENSTYLE_SOLID
);
718 pen
= new wxPen(*GetColour(COLOUR_RED
), 1, wxPENSTYLE_SOLID
);
720 case PEN_TRANSPARENT
:
721 pen
= new wxPen(*GetColour(COLOUR_BLACK
), 1, wxPENSTYLE_TRANSPARENT
);
724 pen
= new wxPen(*GetColour(COLOUR_WHITE
), 1, wxPENSTYLE_SOLID
);
729 ms_stockObject
[item
] = pen
;
734 void wxInitializeStockLists()
736 wxTheColourDatabase
= new wxColourDatabase
;
738 wxTheBrushList
= new wxBrushList
;
739 wxThePenList
= new wxPenList
;
740 wxTheFontList
= new wxFontList
;
743 void wxDeleteStockLists()
745 wxDELETE(wxTheBrushList
);
746 wxDELETE(wxThePenList
);
747 wxDELETE(wxTheFontList
);
749 // wxTheColourDatabase is cleaned up by wxAppBase::CleanUp()
752 // ============================================================================
753 // wxTheXXXList stuff (semi-obsolete)
754 // ============================================================================
756 wxGDIObjListBase::wxGDIObjListBase()
760 wxGDIObjListBase::~wxGDIObjListBase()
762 for (wxList::compatibility_iterator node
= list
.GetFirst(); node
; node
= node
->GetNext())
764 delete static_cast<wxObject
*>(node
->GetData());
768 wxPen
*wxPenList::FindOrCreatePen (const wxColour
& colour
, int width
, wxPenStyle style
)
770 for ( wxList::compatibility_iterator node
= list
.GetFirst();
772 node
= node
->GetNext() )
774 wxPen
* const pen
= (wxPen
*) node
->GetData();
775 if ( pen
->GetWidth () == width
&&
776 pen
->GetStyle () == style
&&
777 pen
->GetColour() == colour
)
782 wxPen
penTmp(colour
, width
, style
);
785 pen
= new wxPen(penTmp
);
792 wxBrush
*wxBrushList::FindOrCreateBrush (const wxColour
& colour
, wxBrushStyle style
)
794 for ( wxList::compatibility_iterator node
= list
.GetFirst();
796 node
= node
->GetNext() )
798 wxBrush
* const brush
= (wxBrush
*) node
->GetData ();
799 if ( brush
->GetStyle() == style
&& brush
->GetColour() == colour
)
803 wxBrush
* brush
= NULL
;
804 wxBrush
brushTmp(colour
, style
);
807 brush
= new wxBrush(brushTmp
);
814 wxFont
*wxFontList::FindOrCreateFont(int pointSize
,
819 const wxString
& facename
,
820 wxFontEncoding encoding
)
823 wxList::compatibility_iterator node
;
824 for (node
= list
.GetFirst(); node
; node
= node
->GetNext())
826 font
= (wxFont
*)node
->GetData();
828 font
->GetPointSize () == pointSize
&&
829 font
->GetStyle () == style
&&
830 font
->GetWeight () == weight
&&
831 font
->GetUnderlined () == underline
)
833 wxFontFamily fontFamily
= (wxFontFamily
)font
->GetFamily();
835 #if defined(__WXGTK__)
836 // under GTK the default family is wxSWISS, so looking for a font
837 // with wxDEFAULT family should return a wxSWISS one instead of
838 // creating a new one
839 bool same
= (fontFamily
== family
) ||
840 (fontFamily
== wxFONTFAMILY_SWISS
&& family
== wxFONTFAMILY_DEFAULT
);
842 // VZ: but why elsewhere do we require an exact match? mystery...
843 bool same
= fontFamily
== family
;
846 // empty facename matches anything at all: this is bad because
847 // depending on which fonts are already created, we might get back
848 // a different font if we create it with empty facename, but it is
849 // still better than never matching anything in the cache at all
851 if ( same
&& !facename
.empty() )
853 const wxString
& fontFace
= font
->GetFaceName();
855 // empty facename matches everything
856 same
= !fontFace
|| fontFace
== facename
;
859 if ( same
&& (encoding
!= wxFONTENCODING_DEFAULT
) )
861 // have to match the encoding too
862 same
= font
->GetEncoding() == encoding
;
872 // font not found, create the new one
874 wxFont
fontTmp(pointSize
, family
, style
, weight
, underline
, facename
, encoding
);
877 font
= new wxFont(fontTmp
);
884 #if WXWIN_COMPATIBILITY_2_6
885 void wxBrushList::AddBrush(wxBrush
*) { }
886 void wxBrushList::RemoveBrush(wxBrush
*) { }
887 void wxFontList::AddFont(wxFont
*) { }
888 void wxFontList::RemoveFont(wxFont
*) { }
889 void wxPenList::AddPen(wxPen
*) { }
890 void wxPenList::RemovePen(wxPen
*) { }
893 wxSize
wxGetDisplaySize()
896 wxDisplaySize(& x
, & y
);
900 wxRect
wxGetClientDisplayRect()
902 int x
, y
, width
, height
;
903 wxClientDisplayRect(&x
, &y
, &width
, &height
); // call plat-specific version
904 return wxRect(x
, y
, width
, height
);
907 wxSize
wxGetDisplaySizeMM()
910 wxDisplaySizeMM(& x
, & y
);
914 wxSize
wxGetDisplayPPI()
916 const wxSize pixels
= wxGetDisplaySize();
917 const wxSize mm
= wxGetDisplaySizeMM();
919 return wxSize((int)((pixels
.x
* inches2mm
) / mm
.x
),
920 (int)((pixels
.y
* inches2mm
) / mm
.y
));
923 wxResourceCache::~wxResourceCache ()
925 wxList::compatibility_iterator node
= GetFirst ();
927 wxObject
*item
= (wxObject
*)node
->GetData();
930 node
= node
->GetNext ();