From ef96bd6af1674973dc7e4810b5b60c18964b4e17 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 23 Apr 2015 19:25:21 +0200 Subject: [PATCH] Compilation fix for wxOSX/wxGTK3 after FromDIP() changes. 100d2a5 didn't update the inline FromDIP() version for these ports. --- include/wx/window.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/wx/window.h b/include/wx/window.h index b7980dd011..97c015aa7c 100644 --- a/include/wx/window.h +++ b/include/wx/window.h @@ -1982,8 +1982,9 @@ inline wxWindow *wxWindowBase::GetGrandParent() const #ifdef wxHAVE_DPI_INDEPENDENT_PIXELS // FromDIP() becomes trivial in this case, so make it inline to avoid overhead. +/* static */ inline wxSize -wxWindowBase::FromDIP(const wxSize& sz, const wxWindowBase* WXUNUSED(w)) const +wxWindowBase::FromDIP(const wxSize& sz, const wxWindowBase* WXUNUSED(w)) { return sz; }