]> git.saurik.com Git - wxWidgets.git/commitdiff
wxUniv/MSW compilation fix in wxWindowBase::GetDlgUnitBase().
authorVadim Zeitlin <vadim@wxwidgets.org>
Sat, 30 Oct 2010 23:51:14 +0000 (23:51 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Sat, 30 Oct 2010 23:51:14 +0000 (23:51 +0000)
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

index a1ded8b8bba856dc9fa6ce4115676da5214c6a7b..9ae19728fa75dac8c584cf64ce17327fb2546e44 100644 (file)
@@ -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() )
     {