From e29f8fdf03b67c0ce1c58b2617bf46b787995f6b Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 15 Sep 2018 02:38:13 +0200
Subject: [PATCH] Revert "update gtk1 font routines to support nwe code in
 wxWidgets"

This reverts commit 8d1063389aacd6966249aa24012e5f1199e9d5d8 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.
---
 include/wx/gtk1/font.h |  6 ++----
 src/gtk1/font.cpp      | 28 ++++------------------------
 2 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/include/wx/gtk1/font.h b/include/wx/gtk1/font.h
index 50bdcd834c..0284f3d6b9 100644
--- a/include/wx/gtk1/font.h
+++ b/include/wx/gtk1/font.h
@@ -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);
diff --git a/src/gtk1/font.cpp b/src/gtk1/font.cpp
index 45dca6abf9..57ba87c846 100644
--- a/src/gtk1/font.cpp
+++ b/src/gtk1/font.cpp
@@ -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();