Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "update gtk1 font routines to support nwe code in wxWidgets"

Browse Source 
This reverts commit 8d1063389a which
prevents https://github.com/wxWidgets/wxWidgets/pull/919 from being
automatically merged and CI builds from running. The changes of that
commit will soon be replaced with the more extensive fixes from this PR.
This commit is contained in:
Vadim Zeitlin
2018-09-15 02:38:13 +02:00
parent 75225cc1a6
commit e29f8fdf03
2 changed files with 6 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/gtk1/font.h
View File

@@ -90,21 +90,19 @@ public:
virtual ~wxFont();
// implement base class pure virtuals
virtual float GetFractionalPointSize() const;
virtual int GetPointSize() const;
virtual wxFontStyle GetStyle() const;
virtual wxFontWeight GetWeight() const;
virtual int GetNumericWeight() const;
virtual wxString GetFaceName() const;
virtual bool GetUnderlined() const;
virtual wxFontEncoding GetEncoding() const;
virtual const wxNativeFontInfo *GetNativeFontInfo() const;
virtual bool IsFixedWidth() const;
virtual void SetPointSize( float pointSize );
virtual void SetPointSize( int pointSize );
virtual void SetFamily(wxFontFamily family);
virtual void SetStyle(wxFontStyle style);
virtual void SetWeight(wxFontWeight weight);
virtual void SetNumericWeight(int weight);
virtual bool SetFaceName( const wxString& faceName );
virtual void SetUnderlined( bool underlined );
virtual void SetEncoding(wxFontEncoding encoding);

28
src/gtk1/font.cpp
View File

@@ -87,7 +87,6 @@ public:
void SetFamily(wxFontFamily family);
void SetStyle(wxFontStyle style);
void SetWeight(wxFontWeight weight);
void SetNumericWeight(int weight);
void SetUnderlined(bool underlined);
bool SetFaceName(const wxString& facename);
void SetEncoding(wxFontEncoding encoding);
@@ -402,11 +401,6 @@ void wxFontRefData::SetWeight(wxFontWeight weight)
}
}
void wxFontRefData::SetNumericWeight(int weight)
{
m_nativeFontInfo.SetNumericWeight(weight);
}
void wxFontRefData::SetUnderlined(bool underlined)
{
m_underlined = underlined;
@@ -524,11 +518,11 @@ wxGDIRefData *wxFont::CloneGDIRefData(const wxGDIRefData *data) const
// accessors
// ----------------------------------------------------------------------------
float wxFont::GetFractionalPointSize() const
int wxFont::GetPointSize() const
{
wxCHECK_MSG( IsOk(), 0, wxT("invalid font") );
return M_FONTDATA->m_nativeFontInfo.GetFractionalPointSize();
return M_FONTDATA->m_pointSize;
}
wxString wxFont::GetFaceName() const
@@ -557,13 +551,6 @@ wxFontWeight wxFont::GetWeight() const
return M_FONTDATA->m_weight;
}
int wxFont::GetNumericWeight() const
{
wxCHECK_MSG( IsOk(), wxFONTWEIGHT_MAX, "invalid font" );
return M_FONTDATA->m_nativeFontInfo.GetNumericWeight();
}
bool wxFont::GetUnderlined() const
{
wxCHECK_MSG( IsOk(), false, wxT("invalid font") );
@@ -614,11 +601,11 @@ bool wxFont::IsFixedWidth() const
// change font attributes
// ----------------------------------------------------------------------------
void wxFont::SetPointSize(float pointSize)
void wxFont::SetPointSize(int pointSize)
{
Unshare();
M_FONTDATA->SetPointSize( nintf(pointSize));
M_FONTDATA->SetPointSize(pointSize);
}
void wxFont::SetFamily(wxFontFamily family)
@@ -642,13 +629,6 @@ void wxFont::SetWeight(wxFontWeight weight)
M_FONTDATA->SetWeight(weight);
}
void wxFont::SetNumericWeight(int weight)
{
AllocExclusive();
M_FONTDATA->SetNumericWeight(weight);
}
bool wxFont::SetFaceName(const wxString& faceName)
{
Unshare();