From 2d4dcfe1a5883ac8cfe92c2d2963e347e8fed61b Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 30 Oct 2010 23:51:14 +0000 Subject: [PATCH] wxUniv/MSW compilation fix in wxWindowBase::GetDlgUnitBase(). This wxWindowBase method can't access protected m_font member of another wxWindow object -- but can access it in wxWindowBase object. Closes #12358. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65963 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/wincmn.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp index a1ded8b8bb..9ae19728fa 100644 --- a/src/common/wincmn.cpp +++ b/src/common/wincmn.cpp @@ -2479,7 +2479,7 @@ void wxWindowBase::DoUpdateWindowUI(wxUpdateUIEvent& event) // using them. wxSize wxWindowBase::GetDlgUnitBase() const { - const wxWindow *parent = wxGetTopLevelParent((wxWindow*)this); + const wxWindowBase * const parent = wxGetTopLevelParent((wxWindow*)this); if ( !parent->m_font.IsOk() ) { -- 2.45.2