// Purpose:
// Author: Robert Roebling
// Id: $Id$
-// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Copyright: (c) 1998 Robert Roebling and Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "font.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
#include "wx/font.h"
#include "wx/fontutil.h"
void SetFaceName(const wxString& facename);
void SetEncoding(wxFontEncoding encoding);
+ 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
void SetNativeFontInfo(const wxNativeFontInfo& info);
void InitFromNative();
private:
-#ifdef __WXGTK20__
- void ClearGdkFonts() { }
-#else // GTK 1.x
- // clear m_scaled_xfonts
+ // clear m_scaled_xfonts if any
void ClearGdkFonts();
+#ifndef __WXGTK20__
// the map of font sizes to "GdkFont *"
wxScaledFontList m_scaled_xfonts;
#endif // GTK 2.0/1.x
- // the broken down font parameters
int m_pointSize;
int m_family,
m_style,
bool m_underlined;
wxString m_faceName;
wxFontEncoding m_encoding; // Unused under GTK 2.0
+ bool m_noAA; // No anti-aliasing
// The native font info, basicly an XFLD under GTK 1.2 and
// the pango font description under GTK 2.0.
friend class wxFont;
};
-// ============================================================================
-// wxFontRefData implementation
-// ============================================================================
-
// ----------------------------------------------------------------------------
-// wxFontRefData creation
+// wxFontRefData
// ----------------------------------------------------------------------------
void wxFontRefData::Init(int pointSize,
m_underlined = underlined;
m_encoding = encoding;
+ m_noAA = FALSE;
+
#ifdef __WXGTK20__
// Create native font info
m_nativeFontInfo.description = pango_font_description_new();
// And set its values
- switch (m_family)
- {
- case wxFONTFAMILY_MODERN:
- case wxFONTFAMILY_TELETYPE:
- pango_font_description_set_family( m_nativeFontInfo.description, "monospace" );
- break;
- case wxFONTFAMILY_SWISS:
- pango_font_description_set_family( m_nativeFontInfo.description, "serif" );
- break;
- default:
- pango_font_description_set_family( m_nativeFontInfo.description, "sans" );
- break;
+ if (!m_faceName.empty())
+ {
+ pango_font_description_set_family( m_nativeFontInfo.description, wxGTK_CONV(m_faceName) );
}
+ else
+ {
+ switch (m_family)
+ {
+ case wxFONTFAMILY_MODERN:
+ case wxFONTFAMILY_TELETYPE:
+ pango_font_description_set_family( m_nativeFontInfo.description, "monospace" );
+ break;
+ case wxFONTFAMILY_ROMAN:
+ pango_font_description_set_family( m_nativeFontInfo.description, "serif" );
+ break;
+ case wxFONTFAMILY_SWISS:
+ // SWISS = sans serif
+ default:
+ pango_font_description_set_family( m_nativeFontInfo.description, "sans" );
+ break;
+ }
+ }
+
SetStyle( m_style );
SetPointSize( m_pointSize );
SetWeight( m_weight );
void wxFontRefData::InitFromNative()
{
+ m_noAA = FALSE;
+
#ifdef __WXGTK20__
// Get native info
PangoFontDescription *desc = m_nativeFontInfo.description;
// init fields
m_faceName = wxGTK_CONV_BACK( pango_font_description_get_family( desc ) );
- m_pointSize = pango_font_description_get_size( desc ) / PANGO_SCALE;
+ // Pango sometimes needs to have a size
+ int pango_size = pango_font_description_get_size( desc );
+ if (pango_size == 0)
+ m_nativeFontInfo.SetPointSize(12);
- switch (pango_font_description_get_style( desc ))
- {
- case PANGO_STYLE_NORMAL:
- m_style = wxFONTSTYLE_NORMAL;
- break;
- case PANGO_STYLE_ITALIC:
- m_style = wxFONTSTYLE_ITALIC;
- break;
- case PANGO_STYLE_OBLIQUE:
- m_style = wxFONTSTYLE_SLANT;
- break;
- }
-
- switch (pango_font_description_get_weight( desc ))
- {
- case PANGO_WEIGHT_ULTRALIGHT:
- m_weight = wxFONTWEIGHT_LIGHT;
- break;
- case PANGO_WEIGHT_LIGHT:
- m_weight = wxFONTWEIGHT_LIGHT;
- break;
- case PANGO_WEIGHT_NORMAL:
- m_weight = wxFONTWEIGHT_NORMAL;
- break;
- case PANGO_WEIGHT_BOLD:
- m_weight = wxFONTWEIGHT_BOLD;
- break;
- case PANGO_WEIGHT_ULTRABOLD:
- m_weight = wxFONTWEIGHT_BOLD;
- break;
- case PANGO_WEIGHT_HEAVY:
- m_weight = wxFONTWEIGHT_BOLD;
- break;
- }
+ m_pointSize = m_nativeFontInfo.GetPointSize();
+ m_style = m_nativeFontInfo.GetStyle();
+ m_weight = m_nativeFontInfo.GetWeight();
if (m_faceName == wxT("monospace"))
{
{
m_family = wxFONTFAMILY_SWISS;
}
+ else if (m_faceName == wxT("serif"))
+ {
+ m_family = wxFONTFAMILY_ROMAN;
+ }
else
{
m_family = wxFONTFAMILY_UNKNOWN;
m_faceName = data.m_faceName;
m_encoding = data.m_encoding;
- m_nativeFontInfo = data.m_nativeFontInfo;
+ m_noAA = data.m_noAA;
+
+ // Forces a copy of the internal data. wxNativeFontInfo should probably
+ // have a copy ctor and assignment operator to fix this properly but that
+ // would break binary compatibility...
+ m_nativeFontInfo.FromString(data.m_nativeFontInfo.ToString());
}
wxFontRefData::wxFontRefData(int size, int family, int style,
InitFromNative();
}
-#ifndef __WXGTK20__
void wxFontRefData::ClearGdkFonts()
{
+#ifndef __WXGTK20__
for ( wxScaledFontList::iterator i = m_scaled_xfonts.begin();
i != m_scaled_xfonts.end();
++i )
}
m_scaled_xfonts.clear();
-}
#endif // GTK 1.x
+}
wxFontRefData::~wxFontRefData()
{
m_pointSize = pointSize;
#ifdef __WXGTK20__
- // Get native info
- PangoFontDescription *desc = m_nativeFontInfo.description;
-
- pango_font_description_set_size( desc, m_pointSize * PANGO_SCALE );
+ m_nativeFontInfo.SetPointSize(pointSize);
#else
if ( HasNativeFont() )
{
m_style = style;
#ifdef __WXGTK20__
- // Get native info
- PangoFontDescription *desc = m_nativeFontInfo.description;
-
- switch ( style )
- {
- case wxFONTSTYLE_ITALIC:
- pango_font_description_set_style( desc, PANGO_STYLE_ITALIC );
- break;
- case wxFONTSTYLE_SLANT:
- pango_font_description_set_style( desc, PANGO_STYLE_OBLIQUE );
- break;
- default:
- wxFAIL_MSG( _T("unknown font style") );
- // fall through
- case wxFONTSTYLE_NORMAL:
- pango_font_description_set_style( desc, PANGO_STYLE_NORMAL );
- break;
- }
+ m_nativeFontInfo.SetStyle((wxFontStyle)style);
#else
if ( HasNativeFont() )
{
{
m_weight = weight;
-#ifndef __WXGTK20__
+#ifdef __WXGTK20__
+ m_nativeFontInfo.SetWeight((wxFontWeight)weight);
+#else //!__WXGTK20__
if ( HasNativeFont() )
{
wxString boldness;
{
m_faceName = facename;
-#ifndef __WXGTK20__
+#ifdef __WXGTK20__
+ m_nativeFontInfo.SetFaceName(facename);
+#else
if ( HasNativeFont() )
{
m_nativeFontInfo.SetXFontComponent(wxXLFD_FAMILY, facename);
InitFromNative();
}
-// ============================================================================
-// wxFont implementation
-// ============================================================================
-
// ----------------------------------------------------------------------------
// wxFont creation
// ----------------------------------------------------------------------------
info.GetFaceName(),
info.GetEncoding() );
#else
- Create(info.GetXFontName());
+ (void) Create(info.GetXFontName());
#endif
}
const wxString& face,
wxFontEncoding encoding)
{
+ UnRef();
+
m_refData = new wxFontRefData(pointSize, family, style, weight,
underlined, face, encoding);
// accessors
// ----------------------------------------------------------------------------
-// all accessors are just forwarded to wxFontRefData which has everything we
-// need
-
int wxFont::GetPointSize() const
{
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") );
+#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(), wxFONTENCODING_DEFAULT, wxT("invalid font") );
+ // m_encoding is unused in wxGTK2, return encoding that the user set.
return M_FONTDATA->m_encoding;
}
-wxNativeFontInfo *wxFont::GetNativeFontInfo() const
+bool wxFont::GetNoAntiAliasing() const
+{
+ wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, wxT("invalid font") );
+
+ return M_FONTDATA->m_noAA;
+}
+
+const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
{
wxCHECK_MSG( Ok(), (wxNativeFontInfo *)NULL, wxT("invalid font") );
-#ifndef __WXGTK20__ // ???
- if ( M_FONTDATA->m_nativeFontInfo.GetXFontName().empty() )
+#ifndef __WXGTK20__
+ if ( !M_FONTDATA->HasNativeFont() )
+ {
+ // NB: this call has important side-effect: it not only finds
+ // GdkFont representation, it also initializes m_nativeFontInfo
+ // by calling its SetXFontName method
GetInternalFont();
+ }
#endif
- return new wxNativeFontInfo(M_FONTDATA->m_nativeFontInfo);
+ return &(M_FONTDATA->m_nativeFontInfo);
}
bool wxFont::IsFixedWidth() const
M_FONTDATA->SetEncoding(encoding);
}
-void wxFont::SetNativeFontInfo(const wxNativeFontInfo& info)
+void wxFont::DoSetNativeFontInfo( const wxNativeFontInfo& info )
+{
+ Unshare();
+
+ M_FONTDATA->SetNativeFontInfo( info );
+}
+
+void wxFont::SetNoAntiAliasing( bool no )
{
Unshare();
- M_FONTDATA->SetNativeFontInfo(info);
+ M_FONTDATA->SetNoAntiAliasing( no );
}
// ----------------------------------------------------------------------------
// get internal representation of font
// ----------------------------------------------------------------------------
+#ifndef __WXGTK20__
static GdkFont *g_systemDefaultGuiFont = (GdkFont*) NULL;
// this is also used from tbargtk.cpp and tooltip.cpp, hence extern
GtkStyle *def = gtk_rc_get_style( widget );
if (def)
{
- g_systemDefaultGuiFont = gdk_font_ref( GET_STYLE_FONT(def) );
+ g_systemDefaultGuiFont = gdk_font_ref( def->font );
}
else
{
def = gtk_widget_get_default_style();
if (def)
- g_systemDefaultGuiFont = gdk_font_ref( GET_STYLE_FONT(def) );
+ g_systemDefaultGuiFont = gdk_font_ref( def->font );
}
gtk_widget_destroy( widget );
}
wxCHECK_MSG( Ok(), font, wxT("invalid font") )
-#ifdef __WXGTK20__
- if (*this == wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT))
- {
- font = GtkGetDefaultGuiFont();
- }
- else
- {
- PangoFontDescription *
- font_description = GetNativeFontInfo()->description;
-
- font = gdk_font_from_description( font_description );
- }
-#else // GTK 1.x
long int_scale = long(scale * 100.0 + 0.5); // key for fontlist
int point_scale = (int)((M_FONTDATA->m_pointSize * 10 * int_scale) / 100);
if ( !font )
{
// do we have the XLFD?
- if ( M_FONTDATA->HasNativeFont() )
+ if ( int_scale == 100 && M_FONTDATA->HasNativeFont() )
{
font = wxLoadFont(M_FONTDATA->m_nativeFontInfo.GetXFontName());
}
M_FONTDATA->m_faceName,
M_FONTDATA->m_encoding,
&xfontname);
- if ( font )
- {
+ // NB: wxFont::GetNativeFontInfo relies on this
+ // side-effect of GetInternalFont
+ if ( int_scale == 100 )
M_FONTDATA->m_nativeFontInfo.SetXFontName(xfontname);
- }
}
}
list[int_scale] = font;
}
}
-#endif // GTK 2.0/1.x
// it's quite useless to make it a wxCHECK because we're going to crash
// anyhow...
return font;
}
+#endif // not GTK 2.0
projects / wxWidgets.git / blobdiff