wxFontRefData(int size,
const wxSize& pixelSize,
bool sizeUsingPixels,
- int family,
- int style,
- int weight,
+ wxFontFamily family,
+ wxFontStyle style,
+ wxFontWeight weight,
bool underlined,
const wxString& faceName,
wxFontEncoding encoding)
wxFontRefData(const wxFontRefData& data) : wxGDIRefData()
{
- if ( data.m_nativeFontInfoOk )
- {
- Init(data.m_nativeFontInfo);
- }
- else
- {
- Init(data.m_pointSize, data.m_pixelSize, data.m_sizeUsingPixels,
- data.m_family, data.m_style, data.m_weight,
- data.m_underlined, data.m_faceName, data.m_encoding);
- }
+ Init(data.m_nativeFontInfo);
}
virtual ~wxFontRefData();
// operations
- bool Alloc(const wxFont *font);
+ bool Alloc();
void Free();
// all wxFont accessors
int GetPointSize() const
{
- return m_nativeFontInfoOk ? m_nativeFontInfo.GetPointSize()
- : m_pointSize;
+ return m_nativeFontInfo.GetPointSize();
}
wxSize GetPixelSize() const
{
- return m_nativeFontInfoOk ? m_nativeFontInfo.GetPixelSize()
- : m_pixelSize;
+ return m_nativeFontInfo.GetPixelSize();
}
bool IsUsingSizeInPixels() const
{
- return m_nativeFontInfoOk ? true : m_sizeUsingPixels;
+ return m_sizeUsingPixels;
}
- int GetFamily() const
+ wxFontFamily GetFamily() const
{
- return m_family;
+ return m_nativeFontInfo.GetFamily();
}
- int GetStyle() const
+ wxFontStyle GetStyle() const
{
- return m_nativeFontInfoOk ? m_nativeFontInfo.GetStyle()
- : m_style;
+ return m_nativeFontInfo.GetStyle();
}
- int GetWeight() const
+ wxFontWeight GetWeight() const
{
- return m_nativeFontInfoOk ? m_nativeFontInfo.GetWeight()
- : m_weight;
+ return m_nativeFontInfo.GetWeight();
}
bool GetUnderlined() const
{
- return m_nativeFontInfoOk ? m_nativeFontInfo.GetUnderlined()
- : m_underlined;
+ return m_nativeFontInfo.GetUnderlined();
}
wxString GetFaceName() const
{
- wxString s;
- if ( m_nativeFontInfoOk )
- s = m_nativeFontInfo.GetFaceName();
- else
- s = m_faceName;
-
- return s;
+ return m_nativeFontInfo.GetFaceName();
}
wxFontEncoding GetEncoding() const
{
- return m_nativeFontInfoOk ? m_nativeFontInfo.GetEncoding()
- : m_encoding;
+ return m_nativeFontInfo.GetEncoding();
}
- WXHFONT GetHFONT(const wxFont *font) const
+ WXHFONT GetHFONT() const
{
if ( !m_hFont )
- wx_const_cast(wxFontRefData *, this)->Alloc(font);
+ const_cast<wxFontRefData *>(this)->Alloc();
return (WXHFONT)m_hFont;
}
{
Free();
- if ( m_nativeFontInfoOk )
- {
- m_nativeFontInfo.SetPointSize(pointSize);
- }
- else
- {
- m_pointSize = pointSize;
- m_sizeUsingPixels = false;
- }
+ m_nativeFontInfo.SetPointSize(pointSize);
+ m_sizeUsingPixels = false;
}
void SetPixelSize(const wxSize& pixelSize)
{
Free();
- if ( m_nativeFontInfoOk )
- {
- m_nativeFontInfo.SetPixelSize(pixelSize);
- }
- else
- {
- m_pixelSize = pixelSize;
- m_sizeUsingPixels = true;
- }
+ m_nativeFontInfo.SetPixelSize(pixelSize);
+ m_sizeUsingPixels = true;
}
- void SetFamily(int family)
+ void SetFamily(wxFontFamily family)
{
Free();
- m_family = family;
+ m_nativeFontInfo.SetFamily(family);
}
- void SetStyle(int style)
+ void SetStyle(wxFontStyle style)
{
Free();
- if ( m_nativeFontInfoOk )
- m_nativeFontInfo.SetStyle((wxFontStyle)style);
- else
- m_style = style;
+ m_nativeFontInfo.SetStyle(style);
}
- void SetWeight(int weight)
+ void SetWeight(wxFontWeight weight)
{
Free();
- if ( m_nativeFontInfoOk )
- m_nativeFontInfo.SetWeight((wxFontWeight)weight);
- else
- m_weight = weight;
+ m_nativeFontInfo.SetWeight(weight);
}
bool SetFaceName(const wxString& faceName)
{
Free();
- if ( m_nativeFontInfoOk )
- return m_nativeFontInfo.SetFaceName(faceName);
-
- m_faceName = faceName;
- return true;
+ return m_nativeFontInfo.SetFaceName(faceName);
}
void SetUnderlined(bool underlined)
{
Free();
- if ( m_nativeFontInfoOk )
- m_nativeFontInfo.SetUnderlined(underlined);
- else
- m_underlined = underlined;
+ m_nativeFontInfo.SetUnderlined(underlined);
}
void SetEncoding(wxFontEncoding encoding)
{
Free();
- if ( m_nativeFontInfoOk )
- m_nativeFontInfo.SetEncoding(encoding);
- else
- m_encoding = encoding;
+ m_nativeFontInfo.SetEncoding(encoding);
}
- // native font info
- bool HasNativeFontInfo() const { return m_nativeFontInfoOk; }
-
const wxNativeFontInfo& GetNativeFontInfo() const
{ return m_nativeFontInfo; }
Free();
m_nativeFontInfo = nativeFontInfo;
- m_nativeFontInfoOk = true;
}
protected:
void Init(int size,
const wxSize& pixelSize,
bool sizeUsingPixels,
- int family,
- int style,
- int weight,
+ wxFontFamily family,
+ wxFontStyle style,
+ wxFontWeight weight,
bool underlined,
const wxString& faceName,
wxFontEncoding encoding);
void Init(const wxNativeFontInfo& info, WXHFONT hFont = 0);
- // font characteristics
- int m_pointSize;
- wxSize m_pixelSize;
- bool m_sizeUsingPixels;
- int m_family;
- int m_style;
- int m_weight;
- bool m_underlined;
- wxString m_faceName;
- wxFontEncoding m_encoding;
+ // are we using m_nativeFontInfo.lf.lfHeight for point size or pixel size?
+ bool m_sizeUsingPixels;
// Windows font handle, created on demand in GetHFONT()
- HFONT m_hFont;
+ HFONT m_hFont;
// Native font info
wxNativeFontInfo m_nativeFontInfo;
- bool m_nativeFontInfoOk;
};
#define M_FONTDATA ((wxFontRefData*)m_refData)
void wxFontRefData::Init(int pointSize,
const wxSize& pixelSize,
bool sizeUsingPixels,
- int family,
- int style,
- int weight,
+ wxFontFamily family,
+ wxFontStyle style,
+ wxFontWeight weight,
bool underlined,
const wxString& faceName,
wxFontEncoding encoding)
{
- m_style = style;
- m_pointSize = pointSize == -1 ? wxNORMAL_FONT->GetPointSize() : pointSize;
- m_pixelSize = pixelSize;
- m_sizeUsingPixels = sizeUsingPixels;
- m_family = family;
- m_style = style;
- m_weight = weight;
- m_underlined = underlined;
- m_faceName = faceName;
- m_encoding = encoding;
+ m_hFont = NULL;
- m_hFont = 0;
-
- m_nativeFontInfoOk = false;
+ m_sizeUsingPixels = sizeUsingPixels;
+ if ( m_sizeUsingPixels )
+ SetPixelSize(pixelSize);
+ else
+ SetPointSize(pointSize);
+
+ SetStyle(style);
+ SetWeight(weight);
+ SetUnderlined(underlined);
+
+ // set the family/facename
+ SetFamily(family);
+ if ( !faceName.empty() )
+ SetFaceName(faceName);
+
+ // deal with encoding now (it may override the font family and facename
+ // so do it after setting them)
+ SetEncoding(encoding);
}
void wxFontRefData::Init(const wxNativeFontInfo& info, WXHFONT hFont)
// (for example where we can't guarantee conversion from HFONT
// to LOGFONT back to HFONT)
m_hFont = (HFONT)hFont;
-
- m_nativeFontInfoOk = true;
m_nativeFontInfo = info;
- // This is the best we can do since we don't have the
- // correct information at this point.
- m_family = wxSWISS;
+
+ // TODO: m_sizeUsingPixels?
}
wxFontRefData::~wxFontRefData()
Free();
}
-bool wxFontRefData::Alloc(const wxFont *font)
+bool wxFontRefData::Alloc()
{
- if ( !m_nativeFontInfoOk )
- {
- wxFillLogFont(&m_nativeFontInfo.lf, font);
- m_nativeFontInfoOk = true;
- }
-
m_hFont = ::CreateFontIndirect(&m_nativeFontInfo.lf);
if ( !m_hFont )
{
#ifdef __WXWINCE__
lf.lfQuality = CLEARTYPE_QUALITY;
#else
- lf.lfQuality = wxSystemOptions::GetOptionInt(_T("msw.font.no-proof-quality"))
+ lf.lfQuality = wxSystemOptions::GetOptionInt("msw.font.no-proof-quality")
? DEFAULT_QUALITY
: PROOF_QUALITY;
#endif
// extract family from pitch-and-family
switch ( lf.lfPitchAndFamily & ~PITCH_MASK )
{
+ case 0:
+ family = wxFONTFAMILY_UNKNOWN;
+ break;
+
case FF_ROMAN:
family = wxFONTFAMILY_ROMAN;
break;
- default:
- wxFAIL_MSG( _T("unknown LOGFONT::lfFamily value") );
- // fall through
-
case FF_SWISS:
family = wxFONTFAMILY_SWISS;
break;
case FF_DECORATIVE:
family = wxFONTFAMILY_DECORATIVE;
break;
+
+ default:
+ wxFAIL_MSG( "unknown LOGFONT::lfFamily value" );
+ family = wxFONTFAMILY_UNKNOWN;
+ // just to avoid a warning
}
return family;
void wxNativeFontInfo::SetPixelSize(const wxSize& pixelSize)
{
+ // NOTE: although the MSW port allows for negative pixel size heights,
+ // other ports don't and since it's a very useful feature assert
+ // here if we get a negative height:
+ wxCHECK_RET( pixelSize.GetWidth() >= 0 && pixelSize.GetHeight() > 0,
+ "Negative values for the pixel size or zero pixel height are not allowed" );
+
lf.lfHeight = pixelSize.GetHeight();
lf.lfWidth = pixelSize.GetWidth();
}
-
void wxNativeFontInfo::SetStyle(wxFontStyle style)
{
switch ( style )
{
default:
- wxFAIL_MSG( _T("unknown font style") );
+ wxFAIL_MSG( "unknown font style" );
// fall through
case wxFONTSTYLE_NORMAL:
switch ( weight )
{
default:
- wxFAIL_MSG( _T("unknown font weight") );
+ wxFAIL_MSG( "unknown font weight" );
// fall through
case wxFONTWEIGHT_NORMAL:
bool wxNativeFontInfo::SetFaceName(const wxString& facename)
{
- size_t len = WXSIZEOF(lf.lfFaceName);
- wxStrncpy(lf.lfFaceName, facename, len);
- lf.lfFaceName[len - 1] = '\0'; // truncate the face name
+ wxStrlcpy(lf.lfFaceName, facename.c_str(), WXSIZEOF(lf.lfFaceName));
return true;
}
switch ( family )
{
- case wxSCRIPT:
+ case wxFONTFAMILY_SCRIPT:
ff_family = FF_SCRIPT;
- facename.Add(_T("Script"));
- facename.Add(_T("Brush Script MT"));
- facename.Add(_T("Comic Sans MS"));
- facename.Add(_T("Lucida Handwriting"));
+ facename.Add(wxS("Script"));
+ facename.Add(wxS("Brush Script MT"));
+ facename.Add(wxS("Comic Sans MS"));
+ facename.Add(wxS("Lucida Handwriting"));
break;
- case wxDECORATIVE:
+ case wxFONTFAMILY_DECORATIVE:
ff_family = FF_DECORATIVE;
- facename.Add(_T("Old English Text MT"));
- facename.Add(_T("Comic Sans MS"));
- facename.Add(_T("Lucida Handwriting"));
+ facename.Add(wxS("Old English Text MT"));
+ facename.Add(wxS("Comic Sans MS"));
+ facename.Add(wxS("Lucida Handwriting"));
break;
- case wxROMAN:
+ case wxFONTFAMILY_ROMAN:
ff_family = FF_ROMAN;
- facename.Add(_T("Times New Roman"));
- facename.Add(_T("Georgia"));
- facename.Add(_T("Garamond"));
- facename.Add(_T("Bookman Old Style"));
- facename.Add(_T("Book Antiqua"));
+ facename.Add(wxS("Times New Roman"));
+ facename.Add(wxS("Georgia"));
+ facename.Add(wxS("Garamond"));
+ facename.Add(wxS("Bookman Old Style"));
+ facename.Add(wxS("Book Antiqua"));
break;
- case wxTELETYPE:
- case wxMODERN:
+ case wxFONTFAMILY_TELETYPE:
+ case wxFONTFAMILY_MODERN:
ff_family = FF_MODERN;
- facename.Add(_T("Courier New"));
- facename.Add(_T("Lucida Console"));
- facename.Add(_T("Andale Mono"));
- facename.Add(_T("OCR A Extended"));
- facename.Add(_T("Terminal"));
+ facename.Add(wxS("Courier New"));
+ facename.Add(wxS("Lucida Console"));
+ facename.Add(wxS("Andale Mono"));
+ facename.Add(wxS("OCR A Extended"));
+ facename.Add(wxS("Terminal"));
break;
- case wxSWISS:
+ case wxFONTFAMILY_SWISS:
ff_family = FF_SWISS;
- facename.Add(_T("Arial"));
- facename.Add(_T("Century Gothic"));
- facename.Add(_T("Lucida Sans Unicode"));
- facename.Add(_T("Tahoma"));
- facename.Add(_T("Trebuchet MS"));
- facename.Add(_T("Verdana"));
+ facename.Add(wxS("Arial"));
+ facename.Add(wxS("Century Gothic"));
+ facename.Add(wxS("Lucida Sans Unicode"));
+ facename.Add(wxS("Tahoma"));
+ facename.Add(wxS("Trebuchet MS"));
+ facename.Add(wxS("Verdana"));
break;
- case wxDEFAULT:
+ case wxFONTFAMILY_DEFAULT:
default:
{
// We want Windows 2000 or later to have new fonts even MS Shell Dlg
int verMaj;
ff_family = FF_SWISS;
if(wxGetOsVersion(&verMaj) == wxOS_WINDOWS_NT && verMaj >= 5)
- facename.Add(_T("MS Shell Dlg 2"));
+ facename.Add(wxS("MS Shell Dlg 2"));
else
- facename.Add(_T("MS Shell Dlg"));
+ facename.Add(wxS("MS Shell Dlg"));
// Quoting the MSDN:
// "MS Shell Dlg is a mapping mechanism that enables
lf.lfPitchAndFamily = (BYTE)(DEFAULT_PITCH) | ff_family;
- if ( !wxStrlen(lf.lfFaceName) )
- {
- SetFaceName(facename);
- }
+ // reset the facename so that CreateFontIndirect() will automatically choose a
+ // face name based only on the font family.
+ lf.lfFaceName[0] = '\0';
}
void wxNativeFontInfo::SetEncoding(wxFontEncoding encoding)
{
long l;
- wxStringTokenizer tokenizer(s, _T(";"));
+ wxStringTokenizer tokenizer(s, wxS(";"), wxTOKEN_RET_EMPTY_ALL);
// first the version
wxString token = tokenizer.GetNextToken();
- if ( token != _T('0') )
+ if ( token != wxS('0') )
return false;
token = tokenizer.GetNextToken();
return false;
lf.lfPitchAndFamily = (BYTE)l;
- token = tokenizer.GetNextToken();
- if(!token)
+ if ( !tokenizer.HasMoreTokens() )
return false;
- wxStrcpy(lf.lfFaceName, token.c_str());
+
+ // the face name may be empty
+ wxStrcpy(lf.lfFaceName, tokenizer.GetNextToken());
return true;
}
{
wxString s;
- s.Printf(_T("%d;%ld;%ld;%ld;%ld;%ld;%d;%d;%d;%d;%d;%d;%d;%d;%s"),
+ s.Printf(wxS("%d;%ld;%ld;%ld;%ld;%ld;%d;%d;%d;%d;%d;%d;%d;%d;%s"),
0, // version, in case we want to change the format later
lf.lfHeight,
lf.lfWidth,
lf.lfClipPrecision,
lf.lfQuality,
lf.lfPitchAndFamily,
- (const wxChar*)lf.lfFaceName);
+ lf.lfFaceName);
return s;
}
// wxFont
// ----------------------------------------------------------------------------
+wxFont::wxFont(const wxString& fontdesc)
+{
+ wxNativeFontInfo info;
+ if ( info.FromString(fontdesc) )
+ (void)Create(info);
+}
+
bool wxFont::Create(const wxNativeFontInfo& info, WXHFONT hFont)
{
UnRef();
return RealizeResource();
}
-wxFont::wxFont(const wxString& fontdesc)
-{
- wxNativeFontInfo info;
- if ( info.FromString(fontdesc) )
- (void)Create(info);
-}
-
bool wxFont::DoCreate(int pointSize,
const wxSize& pixelSize,
bool sizeUsingPixels,
- int family,
- int style,
- int weight,
+ wxFontFamily family,
+ wxFontStyle style,
+ wxFontWeight weight,
bool underlined,
const wxString& faceName,
wxFontEncoding encoding)
// real implementation
// ----------------------------------------------------------------------------
-wxObjectRefData *wxFont::CreateRefData() const
+wxGDIRefData *wxFont::CreateGDIRefData() const
{
return new wxFontRefData();
}
-wxObjectRefData *wxFont::CloneRefData(const wxObjectRefData *data) const
+wxGDIRefData *wxFont::CloneGDIRefData(const wxGDIRefData *data) const
{
- return new wxFontRefData(*wx_static_cast(const wxFontRefData *, data));
+ return new wxFontRefData(*static_cast<const wxFontRefData *>(data));
}
bool wxFont::RealizeResource()
{
- // don't do anything if we already have a valid font
- if ( GetHFONT() )
- return true;
-
- return M_FONTDATA->Alloc(this);
+ // NOTE: the GetHFONT() call automatically triggers a reallocation of
+ // the HFONT if necessary (will do nothing if we already have the resource);
+ // it returns NULL only if there is a failure in wxFontRefData::Alloc()...
+ return GetHFONT() != NULL;
}
bool wxFont::FreeResource(bool WXUNUSED(force))
{
- if ( !GetHFONT() )
+ if ( !M_FONTDATA )
return false;
M_FONTDATA->Free();
WXHFONT wxFont::GetHFONT() const
{
- return M_FONTDATA ? M_FONTDATA->GetHFONT(this) : 0;
+ // NOTE: wxFontRefData::GetHFONT() will automatically call
+ // wxFontRefData::Alloc() if necessary
+ return M_FONTDATA ? M_FONTDATA->GetHFONT() : 0;
}
bool wxFont::IsFree() const
M_FONTDATA->SetPixelSize(pixelSize);
}
-void wxFont::SetFamily(int family)
+void wxFont::SetFamily(wxFontFamily family)
{
AllocExclusive();
M_FONTDATA->SetFamily(family);
}
-void wxFont::SetStyle(int style)
+void wxFont::SetStyle(wxFontStyle style)
{
AllocExclusive();
M_FONTDATA->SetStyle(style);
}
-void wxFont::SetWeight(int weight)
+void wxFont::SetWeight(wxFontWeight weight)
{
AllocExclusive();
int wxFont::GetPointSize() const
{
- wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
+ wxCHECK_MSG( IsOk(), 0, wxT("invalid font") );
return M_FONTDATA->GetPointSize();
}
wxSize wxFont::GetPixelSize() const
{
- wxCHECK_MSG( Ok(), wxDefaultSize, wxT("invalid font") );
+ wxCHECK_MSG( IsOk(), wxDefaultSize, wxT("invalid font") );
return M_FONTDATA->GetPixelSize();
}
bool wxFont::IsUsingSizeInPixels() const
{
- wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
+ wxCHECK_MSG( IsOk(), 0, wxT("invalid font") );
return M_FONTDATA->IsUsingSizeInPixels();
}
-int wxFont::GetFamily() const
+wxFontFamily wxFont::GetFamily() const
{
- wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
+ wxCHECK_MSG( IsOk(), wxFONTFAMILY_MAX, wxT("invalid font") );
return M_FONTDATA->GetFamily();
}
-int wxFont::GetStyle() const
+wxFontStyle wxFont::GetStyle() const
{
- wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
+ wxCHECK_MSG( IsOk(), wxFONTSTYLE_MAX, wxT("invalid font") );
return M_FONTDATA->GetStyle();
}
-int wxFont::GetWeight() const
+wxFontWeight wxFont::GetWeight() const
{
- wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
+ wxCHECK_MSG( IsOk(), wxFONTWEIGHT_MAX, wxT("invalid font") );
return M_FONTDATA->GetWeight();
}
bool wxFont::GetUnderlined() const
{
- wxCHECK_MSG( Ok(), false, wxT("invalid font") );
+ wxCHECK_MSG( IsOk(), false, wxT("invalid font") );
return M_FONTDATA->GetUnderlined();
}
wxString wxFont::GetFaceName() const
{
- wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") );
+ wxCHECK_MSG( IsOk(), wxEmptyString, wxT("invalid font") );
return M_FONTDATA->GetFaceName();
}
wxFontEncoding wxFont::GetEncoding() const
{
- wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, wxT("invalid font") );
+ wxCHECK_MSG( IsOk(), wxFONTENCODING_DEFAULT, wxT("invalid font") );
return M_FONTDATA->GetEncoding();
}
const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
{
- return Ok() && M_FONTDATA->HasNativeFontInfo() ? &(M_FONTDATA->GetNativeFontInfo())
- : NULL;
+ return IsOk() ? &(M_FONTDATA->GetNativeFontInfo()) : NULL;
}
wxString wxFont::GetNativeFontInfoDesc() const
{
- wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") );
+ wxCHECK_MSG( IsOk(), wxEmptyString, wxT("invalid font") );
// be sure we have an HFONT associated...
- wxConstCast(this, wxFont)->RealizeResource();
+ const_cast<wxFont*>(this)->RealizeResource();
return wxFontBase::GetNativeFontInfoDesc();
}
wxString wxFont::GetNativeFontInfoUserDesc() const
{
- wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") );
+ wxCHECK_MSG( IsOk(), wxEmptyString, wxT("invalid font") );
// be sure we have an HFONT associated...
- wxConstCast(this, wxFont)->RealizeResource();
+ const_cast<wxFont*>(this)->RealizeResource();
return wxFontBase::GetNativeFontInfoUserDesc();
}
bool wxFont::IsFixedWidth() const
{
- if ( M_FONTDATA->HasNativeFontInfo() )
- {
- // the two low-order bits specify the pitch of the font, the rest is
- // family
- BYTE pitch =
- (BYTE)(M_FONTDATA->GetNativeFontInfo().lf.lfPitchAndFamily & PITCH_MASK);
+ wxCHECK_MSG( IsOk(), false, wxT("invalid font") );
- return pitch == FIXED_PITCH;
- }
+ // the two low-order bits specify the pitch of the font, the rest is
+ // family
+ BYTE pitch =
+ (BYTE)(M_FONTDATA->GetNativeFontInfo().lf.lfPitchAndFamily & PITCH_MASK);
- return wxFontBase::IsFixedWidth();
+ return pitch == FIXED_PITCH;
}
projects / wxWidgets.git / blobdiff