X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e4db172a3b318df9aff178eb6c5da149d56e0859..3d3f3e3749fa5812c1937736b8745d696263a8b5:/src/gtk/font.cpp?ds=inline diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp index 10183aa014..8dbe0064bd 100644 --- a/src/gtk/font.cpp +++ b/src/gtk/font.cpp @@ -22,14 +22,14 @@ #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/gdicmn.h" #include "wx/tokenzr.h" -#include "wx/settings.h" #include @@ -62,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); @@ -78,7 +78,7 @@ public: 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 @@ -88,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 @@ -159,7 +159,7 @@ void wxFontRefData::Init(int pointSize, m_underlined = underlined; m_encoding = encoding; - m_noAA = FALSE; + m_noAA = false; // Create native font info m_nativeFontInfo.description = pango_font_description_new(); @@ -196,7 +196,7 @@ void wxFontRefData::Init(int pointSize, void wxFontRefData::InitFromNative() { - m_noAA = FALSE; + m_noAA = false; // Get native info PangoFontDescription *desc = m_nativeFontInfo.description; @@ -231,7 +231,7 @@ void wxFontRefData::InitFromNative() } // Pango description are never underlined (?) - m_underlined = FALSE; + m_underlined = false; // always with GTK+ 2 m_encoding = wxFONTENCODING_UTF8; @@ -321,11 +321,11 @@ 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; - m_nativeFontInfo.SetFaceName(facename); + return m_nativeFontInfo.SetFaceName(facename); } void wxFontRefData::SetEncoding(wxFontEncoding encoding) @@ -374,7 +374,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) @@ -384,12 +384,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() @@ -418,31 +418,22 @@ 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(), 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 @@ -452,38 +443,27 @@ int wxFont::GetFamily() const 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; } @@ -511,7 +491,7 @@ const wxNativeFontInfo *wxFont::GetNativeFontInfo() const bool wxFont::IsFixedWidth() const { - wxCHECK_MSG( Ok(), FALSE, wxT("invalid font") ); + wxCHECK_MSG( Ok(), false, wxT("invalid font") ); return wxFontBase::IsFixedWidth(); } @@ -548,11 +528,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)