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

Revert "Implement GetContentScaleFactor for wxMSWDCImpl"

Browse Source 
This reverts commit b0152155c0.

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.
This commit is contained in:
Vadim Zeitlin
2020-07-19 13:39:27 +02:00
parent 379e718a33
commit 73bd293416
2 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/msw/dc.h
View File

@@ -77,7 +77,6 @@ public:
virtual bool CanGetTextExtent() const wxOVERRIDE; virtual bool CanGetTextExtent() const wxOVERRIDE;
virtual int GetDepth() const wxOVERRIDE; virtual int GetDepth() const wxOVERRIDE;
virtual wxSize GetPPI() const wxOVERRIDE; virtual wxSize GetPPI() const wxOVERRIDE;
virtual double GetContentScaleFactor() const wxOVERRIDE;
virtual void SetMapMode(wxMappingMode mode) wxOVERRIDE; virtual void SetMapMode(wxMappingMode mode) wxOVERRIDE;

5
src/msw/dc.cpp
View File

@@ -2555,11 +2555,6 @@ wxSize wxMSWDCImpl::GetPPI() const
return ppi; return ppi;
} }
double wxMSWDCImpl::GetContentScaleFactor() const
{
return GetPPI().y / 96.0;
}
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// DC caching // DC caching
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------