X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..dd9f8b6bb6935360a8271dc3e8749fb026b601a8:/src/gtk1/font.cpp diff --git a/src/gtk1/font.cpp b/src/gtk1/font.cpp index e174e7c2d0..097519952e 100644 --- a/src/gtk1/font.cpp +++ b/src/gtk1/font.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: gtk/font.cpp +// Name: src/gtk1/font.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -19,17 +19,21 @@ #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 -#include "wx/gtk/private.h" +#include "wx/gtk1/private.h" #include // ---------------------------------------------------------------------------- @@ -50,7 +54,7 @@ WX_DECLARE_HASH_MAP(int, GdkFont *, wxIntegerHash, wxIntegerEqual, // wxFontRefData // ---------------------------------------------------------------------------- -class wxFontRefData : public wxObjectRefData +class wxFontRefData : public wxGDIRefData { public: // from broken down font parameters, also default ctor @@ -58,7 +62,7 @@ public: 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); @@ -73,13 +77,8 @@ public: // do we have the native font info? bool HasNativeFont() const { -#ifdef __WXGTK20__ - // we always have a Pango font description - return TRUE; -#else // GTK 1.x // only use m_nativeFontInfo if it had been initialized return !m_nativeFontInfo.IsDefault(); -#endif // GTK 2.0/1.x } // setters: all of them also take care to modify m_nativeFontInfo if we @@ -89,10 +88,10 @@ public: 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 @@ -102,7 +101,7 @@ public: // // VZ: I need this as my gdb either shows wildly wrong values or crashes // when I ask it to "p fontRefData" :-( -#if defined(__WXDEBUG__) && !defined(__WXGTK20__) +#if defined(__WXDEBUG__) void Dump() const { wxPrintf(_T("%s-%s-%s-%d-%d\n"), @@ -135,10 +134,8 @@ private: // 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 int m_pointSize; int m_family, @@ -156,6 +153,8 @@ private: friend class wxFont; }; +#define M_FONTDATA ((wxFontRefData*)m_refData) + // ---------------------------------------------------------------------------- // wxFontRefData // ---------------------------------------------------------------------------- @@ -185,85 +184,13 @@ 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 - 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 ); -#endif // GTK 2.0 + m_noAA = false; } 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 ) ); - - // Pango sometimes needs to have a size - int pango_size = pango_font_description_get_size( desc ); - if (pango_size == 0) - m_nativeFontInfo.SetPointSize(12); - - m_pointSize = m_nativeFontInfo.GetPointSize(); - m_style = m_nativeFontInfo.GetStyle(); - m_weight = m_nativeFontInfo.GetWeight(); - - if (m_faceName == wxT("monospace")) - { - m_family = wxFONTFAMILY_TELETYPE; - } - else if (m_faceName == wxT("sans")) - { - m_family = wxFONTFAMILY_SWISS; - } - else if (m_faceName == wxT("serif")) - { - m_family = wxFONTFAMILY_ROMAN; - } - else - { - m_family = wxFONTFAMILY_UNKNOWN; - } + m_noAA = false; - // Pango description are never underlined (?) - m_underlined = FALSE; - - // Cannot we choose that - m_encoding = wxFONTENCODING_SYSTEM; -#else // GTK 1.x // get the font parameters from the XLFD // ------------------------------------- @@ -288,8 +215,8 @@ void wxFontRefData::InitFromNative() } } - switch ( wxToupper(*m_nativeFontInfo. - GetXFontComponent(wxXLFD_SLANT).c_str()) ) + switch ( wxToupper(m_nativeFontInfo. + GetXFontComponent(wxXLFD_SLANT)[0u]).GetValue() ) { case _T('I'): // italique m_style = wxFONTSTYLE_ITALIC; @@ -329,7 +256,7 @@ void wxFontRefData::InitFromNative() } // X fonts are never underlined... - m_underlined = FALSE; + m_underlined = false; // deal with font encoding wxString @@ -361,11 +288,10 @@ void wxFontRefData::InitFromNative() // may be give a warning here? or use wxFontMapper? m_encoding = wxFONTENCODING_SYSTEM; } -#endif // GTK 2.0/1.x } wxFontRefData::wxFontRefData( const wxFontRefData& data ) - : wxObjectRefData() + : wxGDIRefData() { m_pointSize = data.m_pointSize; m_family = data.m_family; @@ -395,19 +321,14 @@ wxFontRefData::wxFontRefData(int size, int family, int style, wxFontRefData::wxFontRefData(const wxString& fontname) { - // VZ: FromString() should really work in both cases, doesn't it? -#ifdef __WXGTK20__ - m_nativeFontInfo.FromString( fontname ); -#else // GTK 1.x + // FromString() should really work in GTK1 too, doesn't it? m_nativeFontInfo.SetXFontName(fontname); -#endif // GTK 2.0/1.x InitFromNative(); } void wxFontRefData::ClearGdkFonts() { -#ifndef __WXGTK20__ for ( wxScaledFontList::iterator i = m_scaled_xfonts.begin(); i != m_scaled_xfonts.end(); ++i ) @@ -417,7 +338,6 @@ void wxFontRefData::ClearGdkFonts() } m_scaled_xfonts.clear(); -#endif // GTK 1.x } wxFontRefData::~wxFontRefData() @@ -433,9 +353,6 @@ void wxFontRefData::SetPointSize(int pointSize) { m_pointSize = pointSize; -#ifdef __WXGTK20__ - m_nativeFontInfo.SetPointSize(pointSize); -#else if ( HasNativeFont() ) { wxString size; @@ -446,7 +363,6 @@ void wxFontRefData::SetPointSize(int pointSize) m_nativeFontInfo.SetXFontComponent(wxXLFD_POINTSIZE, size); } -#endif } void wxFontRefData::SetFamily(int family) @@ -460,9 +376,6 @@ void wxFontRefData::SetStyle(int style) { m_style = style; -#ifdef __WXGTK20__ - m_nativeFontInfo.SetStyle((wxFontStyle)style); -#else if ( HasNativeFont() ) { wxString slant; @@ -486,16 +399,12 @@ void wxFontRefData::SetStyle(int style) m_nativeFontInfo.SetXFontComponent(wxXLFD_SLANT, slant); } -#endif } void wxFontRefData::SetWeight(int weight) { m_weight = weight; -#ifdef __WXGTK20__ - m_nativeFontInfo.SetWeight((wxFontWeight)weight); -#else //!__WXGTK20__ if ( HasNativeFont() ) { wxString boldness; @@ -520,7 +429,6 @@ void wxFontRefData::SetWeight(int weight) m_nativeFontInfo.SetXFontComponent(wxXLFD_WEIGHT, boldness); } -#endif } void wxFontRefData::SetUnderlined(bool underlined) @@ -530,25 +438,22 @@ void wxFontRefData::SetUnderlined(bool underlined) // the XLFD doesn't have "underlined" field anyhow } -void wxFontRefData::SetFaceName(const wxString& facename) +bool wxFontRefData::SetFaceName(const wxString& facename) { m_faceName = facename; -#ifdef __WXGTK20__ - m_nativeFontInfo.SetFaceName(facename); -#else if ( HasNativeFont() ) { m_nativeFontInfo.SetXFontComponent(wxXLFD_FAMILY, facename); } -#endif + + return true; } void wxFontRefData::SetEncoding(wxFontEncoding encoding) { m_encoding = encoding; -#ifndef __WXGTK20__ if ( HasNativeFont() ) { wxNativeEncodingInfo info; @@ -558,7 +463,6 @@ void wxFontRefData::SetEncoding(wxFontEncoding encoding) m_nativeFontInfo.SetXFontComponent(wxXLFD_ENCODING, info.xencoding); } } -#endif } void wxFontRefData::SetNativeFontInfo(const wxNativeFontInfo& info) @@ -578,25 +482,9 @@ void wxFontRefData::SetNativeFontInfo(const wxNativeFontInfo& info) IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject) -void wxFont::Init() -{ -} - wxFont::wxFont(const wxNativeFontInfo& info) { - Init(); - -#ifdef __WXGTK20__ - Create( info.GetPointSize(), - info.GetFamily(), - info.GetStyle(), - info.GetWeight(), - info.GetUnderlined(), - info.GetFaceName(), - info.GetEncoding() ); -#else (void) Create(info.GetXFontName()); -#endif } bool wxFont::Create( int pointSize, @@ -612,7 +500,7 @@ bool wxFont::Create( int pointSize, m_refData = new wxFontRefData(pointSize, family, style, weight, underlined, face, encoding); - return TRUE; + return true; } bool wxFont::Create(const wxString& fontname) @@ -622,12 +510,12 @@ 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() @@ -648,6 +536,16 @@ wxFont::~wxFont() { } +wxGDIRefData *wxFont::CreateGDIRefData() const +{ + return new wxFontRefData; +} + +wxGDIRefData *wxFont::CloneGDIRefData(const wxGDIRefData *data) const +{ + return new wxFontRefData(*wx_static_cast(const wxFontRefData *, data)); +} + // ---------------------------------------------------------------------------- // accessors // ---------------------------------------------------------------------------- @@ -656,72 +554,40 @@ 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") ); + 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; } @@ -745,7 +611,6 @@ const wxNativeFontInfo *wxFont::GetNativeFontInfo() const { wxCHECK_MSG( Ok(), (wxNativeFontInfo *)NULL, wxT("invalid font") ); -#ifndef __WXGTK20__ if ( !M_FONTDATA->HasNativeFont() ) { // NB: this call has important side-effect: it not only finds @@ -753,16 +618,14 @@ const wxNativeFontInfo *wxFont::GetNativeFontInfo() const // by calling its SetXFontName method GetInternalFont(); } -#endif return &(M_FONTDATA->m_nativeFontInfo); } bool wxFont::IsFixedWidth() const { - wxCHECK_MSG( Ok(), FALSE, wxT("invalid font") ); + wxCHECK_MSG( Ok(), false, wxT("invalid font") ); -#ifndef __WXGTK20__ if ( M_FONTDATA->HasNativeFont() ) { // the monospace fonts are supposed to have "M" in the spacing field @@ -771,7 +634,6 @@ bool wxFont::IsFixedWidth() const return spacing.Upper() == _T('M'); } -#endif return wxFontBase::IsFixedWidth(); } @@ -808,11 +670,12 @@ void wxFont::SetWeight(int weight) 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) @@ -847,7 +710,6 @@ void wxFont::SetNoAntiAliasing( bool 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 @@ -882,7 +744,7 @@ GdkFont *wxFont::GetInternalFont( float scale ) const { 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); @@ -939,5 +801,3 @@ GdkFont *wxFont::GetInternalFont( float scale ) const return font; } -#endif // not GTK 2.0 -