/////////////////////////////////////////////////////////////////////////////
-// Name: gtk/font.cpp
+// Name: src/gtk1/font.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
#include "wx/wxprec.h"
#include "wx/font.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/log.h"
+ #include "wx/settings.h"
+ #include "wx/cmndata.h"
+ #include "wx/gdicmn.h"
+#endif
+
#include "wx/fontutil.h"
-#include "wx/cmndata.h"
#include "wx/utils.h"
-#include "wx/log.h"
-#include "wx/gdicmn.h"
#include "wx/tokenzr.h"
-#include "wx/settings.h"
#include <strings.h>
int family = wxFONTFAMILY_DEFAULT,
int style = wxFONTSTYLE_NORMAL,
int weight = wxFONTWEIGHT_NORMAL,
- bool underlined = FALSE,
+ bool underlined = false,
const wxString& faceName = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
void SetStyle(int style);
void SetWeight(int weight);
void SetUnderlined(bool underlined);
- void SetFaceName(const wxString& facename);
+ bool SetFaceName(const wxString& facename);
void SetEncoding(wxFontEncoding encoding);
- void SetNoAntiAliasing( bool no = TRUE ) { m_noAA = no; }
+ void SetNoAntiAliasing( bool no = true ) { m_noAA = no; }
bool GetNoAntiAliasing() const { return m_noAA; }
// and this one also modifies all the other font data fields
friend class wxFont;
};
+#define M_FONTDATA ((wxFontRefData*)m_refData)
+
// ----------------------------------------------------------------------------
// wxFontRefData
// ----------------------------------------------------------------------------
m_underlined = underlined;
m_encoding = encoding;
- m_noAA = FALSE;
+ m_noAA = false;
}
void wxFontRefData::InitFromNative()
{
- m_noAA = FALSE;
+ m_noAA = false;
// get the font parameters from the XLFD
// -------------------------------------
}
// X fonts are never underlined...
- m_underlined = FALSE;
+ m_underlined = false;
// deal with font encoding
wxString
// the XLFD doesn't have "underlined" field anyhow
}
-void wxFontRefData::SetFaceName(const wxString& facename)
+bool wxFontRefData::SetFaceName(const wxString& facename)
{
m_faceName = facename;
{
m_nativeFontInfo.SetXFontComponent(wxXLFD_FAMILY, facename);
}
+
+ return true;
}
void wxFontRefData::SetEncoding(wxFontEncoding encoding)
m_refData = new wxFontRefData(pointSize, family, style, weight,
underlined, face, encoding);
- return TRUE;
+ return true;
}
bool wxFont::Create(const wxString& fontname)
{
*this = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
- return TRUE;
+ return true;
}
m_refData = new wxFontRefData(fontname);
- return TRUE;
+ return true;
}
void wxFont::Unshare()
{
wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
-#if wxUSE_PANGO
- return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetPointSize()
- : M_FONTDATA->m_pointSize;
-#else
return M_FONTDATA->m_pointSize;
-#endif
}
wxString wxFont::GetFaceName() const
{
- wxCHECK_MSG( Ok(), wxT(""), wxT("invalid font") );
+ wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") );
-#if wxUSE_PANGO
- return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetFaceName()
- : M_FONTDATA->m_faceName;
-#else
return M_FONTDATA->m_faceName;
-#endif
}
int wxFont::GetFamily() const
{
wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
-#if wxUSE_PANGO
- int ret = M_FONTDATA->m_family;
- if (M_FONTDATA->HasNativeFont())
- // wxNativeFontInfo::GetFamily is expensive, must not call more than once
- ret = M_FONTDATA->m_nativeFontInfo.GetFamily();
-
- if (ret == wxFONTFAMILY_DEFAULT)
- ret = M_FONTDATA->m_family;
-
- return ret;
-#else
return M_FONTDATA->m_family;
-#endif
}
int wxFont::GetStyle() const
{
wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
-#if wxUSE_PANGO
- return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetStyle()
- : M_FONTDATA->m_style;
-#else
return M_FONTDATA->m_style;
-#endif
}
int wxFont::GetWeight() const
{
wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
-#if wxUSE_PANGO
- return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetWeight()
- : M_FONTDATA->m_weight;
-#else
return M_FONTDATA->m_weight;
-#endif
}
bool wxFont::GetUnderlined() const
{
- wxCHECK_MSG( Ok(), FALSE, wxT("invalid font") );
+ wxCHECK_MSG( Ok(), false, wxT("invalid font") );
return M_FONTDATA->m_underlined;
}
bool wxFont::IsFixedWidth() const
{
- wxCHECK_MSG( Ok(), FALSE, wxT("invalid font") );
+ wxCHECK_MSG( Ok(), false, wxT("invalid font") );
if ( M_FONTDATA->HasNativeFont() )
{
M_FONTDATA->SetWeight(weight);
}
-void wxFont::SetFaceName(const wxString& faceName)
+bool wxFont::SetFaceName(const wxString& faceName)
{
Unshare();
- M_FONTDATA->SetFaceName(faceName);
+ return M_FONTDATA->SetFaceName(faceName) &&
+ wxFontBase::SetFaceName(faceName);
}
void wxFont::SetUnderlined(bool underlined)
{
GdkFont *font = (GdkFont *) NULL;
- wxCHECK_MSG( Ok(), font, wxT("invalid font") )
+ wxCHECK_MSG( Ok(), font, wxT("invalid font") );
long int_scale = long(scale * 100.0 + 0.5); // key for fontlist
int point_scale = (int)((M_FONTDATA->m_pointSize * 10 * int_scale) / 100);