Define ToDIP() in wxHAVE_DPI_INDEPENDENT_PIXELS case too
Previously any code using this function wouldn't link under GTK+ 3 or OS X where wxHAVE_DPI_INDEPENDENT_PIXELS are defined. Closes #17310.
This commit is contained in:
@@ -1994,7 +1994,9 @@ inline wxWindow *wxWindowBase::GetGrandParent() const
|
|||||||
|
|
||||||
#ifdef wxHAVE_DPI_INDEPENDENT_PIXELS
|
#ifdef wxHAVE_DPI_INDEPENDENT_PIXELS
|
||||||
|
|
||||||
// FromDIP() becomes trivial in this case, so make it inline to avoid overhead.
|
// FromDIP() and ToDIP() become trivial in this case, so make them inline to
|
||||||
|
// avoid any overhead.
|
||||||
|
|
||||||
/* static */
|
/* static */
|
||||||
inline wxSize
|
inline wxSize
|
||||||
wxWindowBase::FromDIP(const wxSize& sz, const wxWindowBase* WXUNUSED(w))
|
wxWindowBase::FromDIP(const wxSize& sz, const wxWindowBase* WXUNUSED(w))
|
||||||
@@ -2002,6 +2004,13 @@ wxWindowBase::FromDIP(const wxSize& sz, const wxWindowBase* WXUNUSED(w))
|
|||||||
return sz;
|
return sz;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* static */
|
||||||
|
inline wxSize
|
||||||
|
wxWindowBase::ToDIP(const wxSize& sz, const wxWindowBase* WXUNUSED(w))
|
||||||
|
{
|
||||||
|
return sz;
|
||||||
|
}
|
||||||
|
|
||||||
#endif // wxHAVE_DPI_INDEPENDENT_PIXELS
|
#endif // wxHAVE_DPI_INDEPENDENT_PIXELS
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
Reference in New Issue
Block a user