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

Don't implement FromDIP and ToDIP in headers

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/dcsvg.h
View File

@@ -248,15 +248,9 @@ private:
virtual wxSize GetPPI() const wxOVERRIDE; virtual wxSize GetPPI() const wxOVERRIDE;
virtual wxSize FromDIP(const wxSize& sz) const wxOVERRIDE virtual wxSize FromDIP(const wxSize& sz) const wxOVERRIDE;
{
return sz;
}
virtual wxSize ToDIP(const wxSize& sz) const wxOVERRIDE virtual wxSize ToDIP(const wxSize& sz) const wxOVERRIDE;
{
return sz;
}
void Init(const wxString& filename, int width, int height, void Init(const wxString& filename, int width, int height,
double dpi, const wxString& title); double dpi, const wxString& title);

10
include/wx/generic/dcpsg.h
View File

@@ -76,15 +76,9 @@ public:
// Resolution in pixels per logical inch // Resolution in pixels per logical inch
wxSize GetPPI() const wxOVERRIDE; wxSize GetPPI() const wxOVERRIDE;
virtual wxSize FromDIP(const wxSize& sz) const wxOVERRIDE virtual wxSize FromDIP(const wxSize& sz) const wxOVERRIDE;
{
return sz;
}
virtual wxSize ToDIP(const wxSize& sz) const wxOVERRIDE virtual wxSize ToDIP(const wxSize& sz) const wxOVERRIDE;
{
return sz;
}
virtual void ComputeScaleAndOrigin() wxOVERRIDE; virtual void ComputeScaleAndOrigin() wxOVERRIDE;

10
include/wx/msw/dcprint.h
View File

@@ -36,15 +36,9 @@ public:
virtual wxRect GetPaperRect() const wxOVERRIDE; virtual wxRect GetPaperRect() const wxOVERRIDE;
virtual wxSize FromDIP(const wxSize& sz) const wxOVERRIDE virtual wxSize FromDIP(const wxSize& sz) const wxOVERRIDE;
{
return sz;
}
virtual wxSize ToDIP(const wxSize& sz) const wxOVERRIDE virtual wxSize ToDIP(const wxSize& sz) const wxOVERRIDE;
{
return sz;
}
void SetFont(const wxFont& font) wxOVERRIDE; void SetFont(const wxFont& font) wxOVERRIDE;

10
src/common/dcsvg.cpp
View File

@@ -580,6 +580,16 @@ wxSize wxSVGFileDCImpl::GetPPI() const
return wxSize(wxRound(m_dpi), wxRound(m_dpi)); 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() void wxSVGFileDCImpl::Clear()
{ {
{ {

9
src/generic/dcpsg.cpp
View File

@@ -1614,6 +1614,15 @@ wxSize wxPostScriptDCImpl::GetPPI() const
return wxSize( DPI, DPI ); 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) ) bool wxPostScriptDCImpl::StartDoc( const wxString& WXUNUSED(message) )
{ {

10
src/msw/dcprint.cpp
View File

@@ -231,6 +231,16 @@ wxRect wxPrinterDCImpl::GetPaperRect() const
return wxRect(x, y, w, h); 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) void wxPrinterDCImpl::SetFont(const wxFont& font)
{ {
wxFont scaledFont = font; wxFont scaledFont = font;