// Author: Julian Smart
// Modified by:
// Created: 01/02/97
-// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
return wxRect(x1, y1, x2-x1, y2-y1);
}
+wxRealPoint::wxRealPoint(const wxPoint& pt)
+ : x(pt.x), y(pt.y)
+{
+}
+
// ============================================================================
// wxColourDatabase
// ============================================================================
// ... and we also allow both grey/gray
wxString colNameAlt = colName;
- if ( !colNameAlt.Replace(_T("GRAY"), _T("GREY")) )
+ if ( !colNameAlt.Replace(wxT("GRAY"), wxT("GREY")) )
{
// but in this case it is not necessary so avoid extra search below
colNameAlt.clear();
wxString colName = colour;
colName.MakeUpper();
wxString colNameAlt = colName;
- if ( !colNameAlt.Replace(_T("GRAY"), _T("GREY")) )
+ if ( !colNameAlt.Replace(wxT("GRAY"), wxT("GREY")) )
colNameAlt.clear();
wxStringToColourHashMap::iterator it = m_map->find(colName);
static wxColour s_col;
s_col = Find(name);
- if ( !s_col.Ok() )
+ if ( !s_col.IsOk() )
return NULL;
return new wxColour(s_col);
{
for (unsigned i = 0; i < ITEMCOUNT; i++)
{
- delete ms_stockObject[i];
- ms_stockObject[i] = NULL;
+ wxDELETE(ms_stockObject[i]);
}
}
font = new wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
break;
case FONT_SMALL:
- font = new wxFont(GetFont(FONT_NORMAL)->GetPointSize() - 2, wxSWISS, wxNORMAL, wxNORMAL);
+ font = new wxFont(GetFont(FONT_NORMAL)->GetPointSize()
+ // Using the font 2 points smaller than the normal one
+ // results in font so small as to be unreadable under MSW.
+ // We might want to actually use -1 under the other
+ // platforms too but for now be conservative and keep -2
+ // there for compatibility with the old behaviour as the
+ // small font seems to be readable enough there as it is.
+#ifdef __WXMSW__
+ - 1,
+#else
+ - 2,
+#endif
+ wxSWISS, wxNORMAL, wxNORMAL);
break;
case FONT_SWISS:
font = new wxFont(GetFont(FONT_NORMAL)->GetPointSize(), wxSWISS, wxNORMAL, wxNORMAL);
wxPen* pen = NULL;
wxPen penTmp(colour, width, style);
- if (penTmp.Ok())
+ if (penTmp.IsOk())
{
pen = new wxPen(penTmp);
list.Append(pen);
wxBrush* brush = NULL;
wxBrush brushTmp(colour, style);
- if (brushTmp.Ok())
+ if (brushTmp.IsOk())
{
brush = new wxBrush(brushTmp);
list.Append(brush);
const wxString& facename,
wxFontEncoding encoding)
{
+ // In all ports but wxOSX, the effective family of a font created using
+ // wxFONTFAMILY_DEFAULT is wxFONTFAMILY_SWISS so this is what we need to
+ // use for comparison.
+ //
+ // In wxOSX the original wxFONTFAMILY_DEFAULT seems to be kept and it uses
+ // a different font than wxFONTFAMILY_SWISS anyhow so we just preserve it.
+#ifndef __WXOSX__
+ if ( family == wxFONTFAMILY_DEFAULT )
+ family = wxFONTFAMILY_SWISS;
+#endif // !__WXOSX__
+
wxFont *font;
wxList::compatibility_iterator node;
for (node = list.GetFirst(); node; node = node->GetNext())
font->GetWeight () == weight &&
font->GetUnderlined () == underline )
{
- wxFontFamily fontFamily = (wxFontFamily)font->GetFamily();
-
-#if defined(__WXGTK__)
- // under GTK the default family is wxSWISS, so looking for a font
- // with wxDEFAULT family should return a wxSWISS one instead of
- // creating a new one
- bool same = (fontFamily == family) ||
- (fontFamily == wxFONTFAMILY_SWISS && family == wxFONTFAMILY_DEFAULT);
-#else // !GTK
- // VZ: but why elsewhere do we require an exact match? mystery...
- bool same = fontFamily == family;
-#endif // GTK/!GTK
+ bool same = font->GetFamily() == family;
// empty facename matches anything at all: this is bad because
// depending on which fonts are already created, we might get back
// font not found, create the new one
font = NULL;
wxFont fontTmp(pointSize, family, style, weight, underline, facename, encoding);
- if (fontTmp.Ok())
+ if (fontTmp.IsOk())
{
font = new wxFont(fontTmp);
list.Append(font);