From 73bd293416d96ec82e1e2754cbd76eba4e2a380d Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 19 Jul 2020 13:39:27 +0200 Subject: [PATCH] Revert "Implement GetContentScaleFactor for wxMSWDCImpl" This reverts commit b0152155c0cd48d38004fc246a2540cd5fec438f. After changing wxWindow::GetContentScaleFactor() to return 1 on platforms without logical pixels, such as MSW, in the grandparent commit, make wxDC::GetContentScaleFactor() consistent with it too. --- include/wx/msw/dc.h | 1 - src/msw/dc.cpp | 5 ----- 2 files changed, 6 deletions(-) diff --git a/include/wx/msw/dc.h b/include/wx/msw/dc.h index 50dd717d9f..a27b70dab3 100644 --- a/include/wx/msw/dc.h +++ b/include/wx/msw/dc.h @@ -77,7 +77,6 @@ public: virtual bool CanGetTextExtent() const wxOVERRIDE; virtual int GetDepth() const wxOVERRIDE; virtual wxSize GetPPI() const wxOVERRIDE; - virtual double GetContentScaleFactor() const wxOVERRIDE; virtual void SetMapMode(wxMappingMode mode) wxOVERRIDE; diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp index 6e9209baa1..39ac13ec3d 100644 --- a/src/msw/dc.cpp +++ b/src/msw/dc.cpp @@ -2555,11 +2555,6 @@ wxSize wxMSWDCImpl::GetPPI() const return ppi; } -double wxMSWDCImpl::GetContentScaleFactor() const -{ - return GetPPI().y / 96.0; -} - // ---------------------------------------------------------------------------- // DC caching // ----------------------------------------------------------------------------