// Modified by:
// Created: 20.09.99
// RCS-ID: $Id$
-// Copyright: (c) wxWindows team
-// Licence: wxWindows license
+// Copyright: (c) wxWidgets team
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "fontbase.h"
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma implementation "fontbase.h"
#endif
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
- #pragma hdrstop
+#pragma hdrstop
#endif
#ifndef WX_PRECOMP
- #include "wx/font.h"
+#include "wx/font.h"
+#include "wx/intl.h"
#endif // WX_PRECOMP
#include "wx/gdicmn.h"
+
+#if defined(__WXMSW__)
+ #include "wx/msw/private.h" // includes windows.h for LOGFONT
+ #include "wx/msw/winundef.h"
+#endif
+
#include "wx/fontutil.h" // for wxNativeFontInfo
#include "wx/fontmap.h"
wxFontEncoding wxFontBase::ms_encodingDefault = wxFONTENCODING_SYSTEM;
+/* static */
+void wxFontBase::SetDefaultEncoding(wxFontEncoding encoding)
+{
+ // GetDefaultEncoding() should return something != wxFONTENCODING_DEFAULT
+ // and, besides, using this value here doesn't make any sense
+ wxCHECK_RET( encoding != wxFONTENCODING_DEFAULT,
+ _T("can't set default encoding to wxFONTENCODING_DEFAULT") );
+
+ ms_encodingDefault = encoding;
+}
+
+wxFontBase::~wxFontBase()
+{
+ // this destructor is required for Darwin
+}
+
/* static */
wxFont *wxFontBase::New(int size,
int family,
return new wxFont(size, family, style, weight, underlined, face, encoding);
}
+/* static */
+wxFont *wxFontBase::New(int pointSize,
+ wxFontFamily family,
+ int flags,
+ const wxString& face,
+ wxFontEncoding encoding)
+{
+ return New
+ (
+ pointSize,
+ family,
+ flags & wxFONTFLAG_ITALIC
+ ? wxFONTSTYLE_ITALIC
+ : flags & wxFONTFLAG_SLANT
+ ? wxFONTSTYLE_SLANT
+ : wxFONTSTYLE_NORMAL,
+ flags & wxFONTFLAG_LIGHT
+ ? wxFONTWEIGHT_LIGHT
+ : flags & wxFONTFLAG_BOLD
+ ? wxFONTWEIGHT_BOLD
+ : wxFONTWEIGHT_NORMAL,
+ (flags & wxFONTFLAG_UNDERLINED) != 0,
+ face,
+ encoding
+ );
+}
+
/* static */
wxFont *wxFontBase::New(const wxNativeFontInfo& info)
{
return New(fontInfo);
}
-wxNativeFontInfo *wxFontBase::GetNativeFontInfo() const
+bool wxFontBase::IsFixedWidth() const
{
-#ifdef wxNO_NATIVE_FONTINFO
- wxNativeFontInfo *fontInfo = new wxNativeFontInfo();
-
- fontInfo->SetPointSize(GetPointSize());
- fontInfo->SetFamily(GetFamily());
- fontInfo->SetStyle((wxFontStyle)GetStyle());
- fontInfo->SetWeight((wxFontWeight)GetWeight());
- fontInfo->SetUnderlined(GetUnderlined());
- fontInfo->SetFaceName(GetFaceName());
- fontInfo->SetEncoding(GetEncoding());
-
- return fontInfo;
-#else
- return (wxNativeFontInfo *)NULL;
-#endif
+ return GetFamily() == wxFONTFAMILY_TELETYPE;
}
-void wxFontBase::SetNativeFontInfo(const wxNativeFontInfo& info)
+void wxFontBase::DoSetNativeFontInfo(const wxNativeFontInfo& info)
{
#ifdef wxNO_NATIVE_FONTINFO
SetPointSize(info.pointSize);
wxString wxFontBase::GetNativeFontInfoDesc() const
{
wxString fontDesc;
- wxNativeFontInfo *fontInfo = GetNativeFontInfo();
+ const wxNativeFontInfo *fontInfo = GetNativeFontInfo();
if ( fontInfo )
{
fontDesc = fontInfo->ToString();
- delete fontInfo;
}
return fontDesc;
wxString wxFontBase::GetNativeFontInfoUserDesc() const
{
wxString fontDesc;
- wxNativeFontInfo *fontInfo = GetNativeFontInfo();
+ const wxNativeFontInfo *fontInfo = GetNativeFontInfo();
if ( fontInfo )
{
fontDesc = fontInfo->ToUserString();
- delete fontInfo;
}
return fontDesc;
token = tokenizer.GetNextToken();
if ( !token.ToLong(&l) )
return FALSE;
- family = (int)l;
+ family = (wxFontFamily)l;
token = tokenizer.GetNextToken();
if ( !token.ToLong(&l) )
underlined = l != 0;
faceName = tokenizer.GetNextToken();
+
+#ifndef __WXMAC__
if( !faceName )
return FALSE;
+#endif
token = tokenizer.GetNextToken();
if ( !token.ToLong(&l) )
void wxNativeFontInfo::Init()
{
- pointSize = wxNORMAL_FONT->GetPointSize();
+ pointSize = 0;
family = wxFONTFAMILY_DEFAULT;
style = wxFONTSTYLE_NORMAL;
weight = wxFONTWEIGHT_NORMAL;
return faceName;
}
+wxFontFamily wxNativeFontInfo::GetFamily() const
+{
+ return family;
+}
+
wxFontEncoding wxNativeFontInfo::GetEncoding() const
{
return encoding;
void wxNativeFontInfo::SetFaceName(wxString facename_)
{
- facename = facename_;
+ faceName = facename_;
+}
+
+void wxNativeFontInfo::SetFamily(wxFontFamily family_)
+{
+ family = family_;
}
void wxNativeFontInfo::SetEncoding(wxFontEncoding encoding_)
// format there anyhow (but there is a well-defined standard for X11 fonts used
// by wxGTK and wxMotif)
-#if defined(wxNO_NATIVE_FONTINFO) || defined(__WXMSW__)
+#if defined(wxNO_NATIVE_FONTINFO) || defined(__WXMSW__) || defined (__WXPM__)
wxString wxNativeFontInfo::ToUserString() const
{
// we don't distinguish between the two for now anyhow...
case wxFONTSTYLE_ITALIC:
case wxFONTSTYLE_SLANT:
- desc << _("italic ");
+ desc << _("italic");
break;
}
- if ( !facename.empty() )
+ wxString face = GetFaceName();
+ if ( !face.empty() )
{
- desc << facename << _T(' ');
+ desc << _T(' ') << face;
}
- if ( pointsize != wxNORMAL_FONT->GetPointSize() )
+ int size = GetPointSize();
+ if ( size != wxNORMAL_FONT->GetPointSize() )
{
- desc << pointsize;
+ desc << _T(' ') << size;
}
+
+#if wxUSE_FONTMAP
+ wxFontEncoding enc = GetEncoding();
+ if ( enc != wxFONTENCODING_DEFAULT && enc != wxFONTENCODING_SYSTEM )
+ {
+ desc << _T(' ') << wxFontMapper::Get()->GetEncodingName(enc);
+ }
+#endif // wxUSE_FONTMAP
+
+ return desc;
}
bool wxNativeFontInfo::FromUserString(const wxString& s)
wxString face;
unsigned long size;
+
+#if wxUSE_FONTMAP
wxFontEncoding encoding;
+#endif // wxUSE_FONTMAP
while ( tokenizer.HasMoreTokens() )
{
}
else if ( token.ToULong(&size) )
{
- pointsize = (int)size;
+ SetPointSize(size);
}
- else if ( (encoding = wxTheFontMapper->CharsetToEncoding(token, FALSE))
+#if wxUSE_FONTMAP
+ else if ( (encoding = wxFontMapper::Get()->CharsetToEncoding(token, FALSE))
!= wxFONTENCODING_DEFAULT )
{
SetEncoding(encoding);
}
+#endif // wxUSE_FONTMAP
else // assume it is the face name
{
if ( !face.empty() )
return TRUE;
}
-#endif // generic or wxMSW
+#endif // generic or wxMSW or wxOS2
projects / wxWidgets.git / blobdiff