Don't implement FromDIP and ToDIP in headers

This commit is contained in:
Maarten Bent
2022-04-29 00:38:46 +02:00
parent 6072d3aeee
commit dc5fe63cb2
6 changed files with 35 additions and 24 deletions

View File

@@ -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);

View File

@@ -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;

View File

@@ -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;

View File

@@ -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()
{
{

View File

@@ -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) )
{

View File

@@ -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;