From dc5fe63cb2b58ce62698a6fd8f2908d4d6689443 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Fri, 29 Apr 2022 00:38:46 +0200
Subject: [PATCH] Don't implement FromDIP and ToDIP in headers

---
 include/wx/dcsvg.h         | 10 ++--------
 include/wx/generic/dcpsg.h | 10 ++--------
 include/wx/msw/dcprint.h   | 10 ++--------
 src/common/dcsvg.cpp       | 10 ++++++++++
 src/generic/dcpsg.cpp      |  9 +++++++++
 src/msw/dcprint.cpp        | 10 ++++++++++
 6 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/include/wx/dcsvg.h b/include/wx/dcsvg.h
index 778e247446..fcdecc036c 100644
--- a/include/wx/dcsvg.h
+++ b/include/wx/dcsvg.h
@@ -248,15 +248,9 @@ private:
 
     virtual wxSize GetPPI() const wxOVERRIDE;
 
-    virtual wxSize FromDIP(const wxSize& sz) const wxOVERRIDE
-    {
-        return sz;
-    }
+    virtual wxSize FromDIP(const wxSize& sz) const wxOVERRIDE;
 
-    virtual wxSize ToDIP(const wxSize& sz) const wxOVERRIDE
-    {
-        return sz;
-    }
+    virtual wxSize ToDIP(const wxSize& sz) const wxOVERRIDE;
 
     void Init(const wxString& filename, int width, int height,
               double dpi, const wxString& title);
diff --git a/include/wx/generic/dcpsg.h b/include/wx/generic/dcpsg.h
index 17b58c6285..cf3e1356ff 100644
--- a/include/wx/generic/dcpsg.h
+++ b/include/wx/generic/dcpsg.h
@@ -76,15 +76,9 @@ public:
     // Resolution in pixels per logical inch
     wxSize GetPPI() const wxOVERRIDE;
 
-    virtual wxSize FromDIP(const wxSize& sz) const wxOVERRIDE
-    {
-        return sz;
-    }
+    virtual wxSize FromDIP(const wxSize& sz) const wxOVERRIDE;
 
-    virtual wxSize ToDIP(const wxSize& sz) const wxOVERRIDE
-    {
-        return sz;
-    }
+    virtual wxSize ToDIP(const wxSize& sz) const wxOVERRIDE;
 
     virtual void ComputeScaleAndOrigin() wxOVERRIDE;
 
diff --git a/include/wx/msw/dcprint.h b/include/wx/msw/dcprint.h
index fac813719d..845c0d64ab 100644
--- a/include/wx/msw/dcprint.h
+++ b/include/wx/msw/dcprint.h
@@ -36,15 +36,9 @@ public:
 
     virtual wxRect GetPaperRect() const wxOVERRIDE;
 
-    virtual wxSize FromDIP(const wxSize& sz) const wxOVERRIDE
-    {
-        return sz;
-    }
+    virtual wxSize FromDIP(const wxSize& sz) const wxOVERRIDE;
 
-    virtual wxSize ToDIP(const wxSize& sz) const wxOVERRIDE
-    {
-        return sz;
-    }
+    virtual wxSize ToDIP(const wxSize& sz) const wxOVERRIDE;
 
     void SetFont(const wxFont& font) wxOVERRIDE;
 
diff --git a/src/common/dcsvg.cpp b/src/common/dcsvg.cpp
index 6104c349d3..5e5b20c81a 100644
--- a/src/common/dcsvg.cpp
+++ b/src/common/dcsvg.cpp
@@ -580,6 +580,16 @@ wxSize wxSVGFileDCImpl::GetPPI() const
     return wxSize(wxRound(m_dpi), wxRound(m_dpi));
 }
 
+wxSize wxSVGFileDCImpl::FromDIP(const wxSize& sz) const
+{
+    return sz;
+}
+
+wxSize wxSVGFileDCImpl::ToDIP(const wxSize& sz) const
+{
+    return sz;
+}
+
 void wxSVGFileDCImpl::Clear()
 {
     {
diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp
index a089c8a8d1..62d8d43b91 100644
--- a/src/generic/dcpsg.cpp
+++ b/src/generic/dcpsg.cpp
@@ -1614,6 +1614,15 @@ wxSize wxPostScriptDCImpl::GetPPI() const
     return wxSize( DPI, DPI );
 }
 
+wxSize wxPostScriptDCImpl::FromDIP(const wxSize& sz) const
+{
+    return sz;
+}
+
+wxSize wxPostScriptDCImpl::ToDIP(const wxSize& sz) const
+{
+    return sz;
+}
 
 bool wxPostScriptDCImpl::StartDoc( const wxString& WXUNUSED(message) )
 {
diff --git a/src/msw/dcprint.cpp b/src/msw/dcprint.cpp
index 294e7ebe84..b12aa4c73c 100644
--- a/src/msw/dcprint.cpp
+++ b/src/msw/dcprint.cpp
@@ -231,6 +231,16 @@ wxRect wxPrinterDCImpl::GetPaperRect() const
     return wxRect(x, y, w, h);
 }
 
+wxSize wxPrinterDCImpl::FromDIP(const wxSize& sz) const
+{
+    return sz;
+}
+
+wxSize wxPrinterDCImpl::ToDIP(const wxSize& sz) const
+{
+    return sz;
+}
+
 void wxPrinterDCImpl::SetFont(const wxFont& font)
 {
     wxFont scaledFont = font;