/////////////////////////////////////////////////////////////////////////////
-// Name: gtk/font.cpp
+// Name: src/gtk/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/utils.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>
#include "wx/gtk/private.h"
-#include <gdk/gdkprivate.h>
// ----------------------------------------------------------------------------
// constants
// the default size (in points) for the fonts
static const int wxDEFAULT_FONT_SIZE = 12;
-// ----------------------------------------------------------------------------
-// wxScaledFontList: maps the font sizes to the GDK fonts for the given font
-// ----------------------------------------------------------------------------
-
-WX_DECLARE_HASH_MAP(int, GdkFont *, wxIntegerHash, wxIntegerEqual,
- wxScaledFontList);
-
// ----------------------------------------------------------------------------
// wxFontRefData
// ----------------------------------------------------------------------------
-class wxFontRefData : public wxObjectRefData
+class wxFontRefData : public wxGDIRefData
{
public:
// from broken down font parameters, also default ctor
wxFontRefData(int size = -1,
- int family = wxFONTFAMILY_DEFAULT,
- int style = wxFONTSTYLE_NORMAL,
- int weight = wxFONTWEIGHT_NORMAL,
- bool underlined = FALSE,
+ wxFontFamily family = wxFONTFAMILY_DEFAULT,
+ wxFontStyle style = wxFONTSTYLE_NORMAL,
+ wxFontWeight weight = wxFONTWEIGHT_NORMAL,
+ bool underlined = false,
const wxString& faceName = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
bool HasNativeFont() const
{
// we always have a Pango font description
- return TRUE;
+ return true;
}
// setters: all of them also take care to modify m_nativeFontInfo if we
// have it so as to not lose the information not carried by our fields
void SetPointSize(int pointSize);
- void SetFamily(int family);
- void SetStyle(int style);
- void SetWeight(int weight);
+ void SetFamily(wxFontFamily family);
+ void SetStyle(wxFontStyle style);
+ void SetWeight(wxFontWeight 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
protected:
// common part of all ctors
void Init(int pointSize,
- int family,
- int style,
- int weight,
+ wxFontFamily family,
+ wxFontStyle style,
+ wxFontWeight weight,
bool underlined,
const wxString& faceName,
wxFontEncoding encoding);
void ClearGdkFonts();
int m_pointSize;
- int m_family,
- m_style,
- m_weight;
+ wxFontFamily m_family;
+ wxFontStyle m_style;
+ wxFontWeight m_weight;
bool m_underlined;
wxString m_faceName;
- wxFontEncoding m_encoding; // Unused under GTK 2.0
+ wxFontEncoding m_encoding;
bool m_noAA; // No anti-aliasing
// The native font info, basicly an XFLD under GTK 1.2 and
friend class wxFont;
};
+#define M_FONTDATA ((wxFontRefData*)m_refData)
+
// ----------------------------------------------------------------------------
// wxFontRefData
// ----------------------------------------------------------------------------
void wxFontRefData::Init(int pointSize,
- int family,
- int style,
- int weight,
+ wxFontFamily family,
+ wxFontStyle style,
+ wxFontWeight weight,
bool underlined,
const wxString& faceName,
wxFontEncoding encoding)
m_underlined = underlined;
m_encoding = encoding;
+ if ( m_encoding == wxFONTENCODING_DEFAULT )
+ m_encoding = wxFont::GetDefaultEncoding();
- m_noAA = FALSE;
+ m_noAA = false;
// Create native font info
m_nativeFontInfo.description = pango_font_description_new();
// And set its values
if (!m_faceName.empty())
{
- pango_font_description_set_family( m_nativeFontInfo.description, wxGTK_CONV(m_faceName) );
+ pango_font_description_set_family( m_nativeFontInfo.description,
+ wxGTK_CONV_SYS(m_faceName) );
}
else
{
void wxFontRefData::InitFromNative()
{
- m_noAA = FALSE;
+ m_noAA = false;
// Get native info
PangoFontDescription *desc = m_nativeFontInfo.description;
// init fields
- m_faceName = wxGTK_CONV_BACK( pango_font_description_get_family( desc ) );
+ m_faceName = wxGTK_CONV_BACK_SYS(pango_font_description_get_family(desc));
// Pango sometimes needs to have a size
int pango_size = pango_font_description_get_size( desc );
}
// Pango description are never underlined (?)
- m_underlined = FALSE;
+ m_underlined = false;
- // Cannot we choose that
- m_encoding = wxFONTENCODING_SYSTEM;
+ // always with GTK+ 2
+ m_encoding = wxFONTENCODING_UTF8;
}
wxFontRefData::wxFontRefData( const wxFontRefData& data )
- : wxObjectRefData()
+ : wxGDIRefData()
{
m_pointSize = data.m_pointSize;
m_family = data.m_family;
m_nativeFontInfo.FromString(data.m_nativeFontInfo.ToString());
}
-wxFontRefData::wxFontRefData(int size, int family, int style,
- int weight, bool underlined,
+wxFontRefData::wxFontRefData(int size, wxFontFamily family, wxFontStyle style,
+ wxFontWeight weight, bool underlined,
const wxString& faceName,
wxFontEncoding encoding)
{
m_nativeFontInfo.SetPointSize(pointSize);
}
-void wxFontRefData::SetFamily(int family)
+void wxFontRefData::SetFamily(wxFontFamily family)
{
m_family = family;
// TODO: what are we supposed to do with m_nativeFontInfo here?
}
-void wxFontRefData::SetStyle(int style)
+void wxFontRefData::SetStyle(wxFontStyle style)
{
m_style = style;
m_nativeFontInfo.SetStyle((wxFontStyle)style);
}
-void wxFontRefData::SetWeight(int weight)
+void wxFontRefData::SetWeight(wxFontWeight weight)
{
m_weight = weight;
// 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.SetFaceName(facename);
+ return m_nativeFontInfo.SetFaceName(facename);
}
void wxFontRefData::SetEncoding(wxFontEncoding encoding)
}
bool wxFont::Create( int pointSize,
- int family,
- int style,
- int weight,
+ wxFontFamily family,
+ wxFontStyle style,
+ wxFontWeight weight,
bool underlined,
const wxString& face,
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;
-}
-
-void wxFont::Unshare()
-{
- if (!m_refData)
- {
- m_refData = new wxFontRefData();
- }
- else
- {
- wxFontRefData* ref = new wxFontRefData(*(wxFontRefData*)m_refData);
- UnRef();
- m_refData = ref;
- }
+ return true;
}
wxFont::~wxFont()
{
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
+wxFontFamily wxFont::GetFamily() const
{
- wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
+ wxCHECK_MSG( Ok(), wxFONTFAMILY_MAX, wxT("invalid font") );
-#if wxUSE_PANGO
- int ret = M_FONTDATA->m_family;
+ wxFontFamily 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();
ret = M_FONTDATA->m_family;
return ret;
-#else
- return M_FONTDATA->m_family;
-#endif
}
-int wxFont::GetStyle() const
+wxFontStyle wxFont::GetStyle() const
{
- wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
+ wxCHECK_MSG( Ok(), wxFONTSTYLE_MAX, 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
+wxFontWeight wxFont::GetWeight() const
{
- wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
+ wxCHECK_MSG( Ok(), wxFONTWEIGHT_MAX, 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;
}
wxFontEncoding wxFont::GetEncoding() const
{
- wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, wxT("invalid font") );
+ wxCHECK_MSG( Ok(), wxFONTENCODING_SYSTEM, wxT("invalid font") );
- // m_encoding is unused in wxGTK2, return encoding that the user set.
return M_FONTDATA->m_encoding;
}
bool wxFont::GetNoAntiAliasing() const
{
- wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, wxT("invalid font") );
+ wxCHECK_MSG( Ok(), false, wxT("invalid font") );
return M_FONTDATA->m_noAA;
}
const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
{
- wxCHECK_MSG( Ok(), (wxNativeFontInfo *)NULL, wxT("invalid font") );
+ wxCHECK_MSG( Ok(), NULL, wxT("invalid font") );
return &(M_FONTDATA->m_nativeFontInfo);
}
bool wxFont::IsFixedWidth() const
{
- wxCHECK_MSG( Ok(), FALSE, wxT("invalid font") );
+ wxCHECK_MSG( Ok(), false, wxT("invalid font") );
return wxFontBase::IsFixedWidth();
}
void wxFont::SetPointSize(int pointSize)
{
- Unshare();
+ AllocExclusive();
M_FONTDATA->SetPointSize(pointSize);
}
-void wxFont::SetFamily(int family)
+void wxFont::SetFamily(wxFontFamily family)
{
- Unshare();
+ AllocExclusive();
M_FONTDATA->SetFamily(family);
}
-void wxFont::SetStyle(int style)
+void wxFont::SetStyle(wxFontStyle style)
{
- Unshare();
+ AllocExclusive();
M_FONTDATA->SetStyle(style);
}
-void wxFont::SetWeight(int weight)
+void wxFont::SetWeight(wxFontWeight weight)
{
- Unshare();
+ AllocExclusive();
M_FONTDATA->SetWeight(weight);
}
-void wxFont::SetFaceName(const wxString& faceName)
+bool wxFont::SetFaceName(const wxString& faceName)
{
- Unshare();
+ AllocExclusive();
- M_FONTDATA->SetFaceName(faceName);
+ return M_FONTDATA->SetFaceName(faceName) &&
+ wxFontBase::SetFaceName(faceName);
}
void wxFont::SetUnderlined(bool underlined)
{
- Unshare();
+ AllocExclusive();
M_FONTDATA->SetUnderlined(underlined);
}
void wxFont::SetEncoding(wxFontEncoding encoding)
{
- Unshare();
+ AllocExclusive();
M_FONTDATA->SetEncoding(encoding);
}
void wxFont::DoSetNativeFontInfo( const wxNativeFontInfo& info )
{
- Unshare();
+ AllocExclusive();
M_FONTDATA->SetNativeFontInfo( info );
}
void wxFont::SetNoAntiAliasing( bool no )
{
- Unshare();
+ AllocExclusive();
M_FONTDATA->SetNoAntiAliasing( no );
}
+
+wxGDIRefData* wxFont::CreateGDIRefData() const
+{
+ return new wxFontRefData;
+}
+
+wxGDIRefData* wxFont::CloneGDIRefData(const wxGDIRefData* data) const
+{
+ return new wxFontRefData(*static_cast<const wxFontRefData*>(data));
+}
projects / wxWidgets.git / blobdiff