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

resolve multiple inheritance ambiguity

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69573 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2011-10-29 04:50:04 +00:00
parent 07acbd34a5
commit c78f085763
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/msw/radiobox.h
View File

@@ -163,6 +163,8 @@ protected:
virtual WXHRGN MSWGetRegionWithoutChildren(); virtual WXHRGN MSWGetRegionWithoutChildren();
#endif // __WXWINCE__ #endif // __WXWINCE__
// resolve ambiguity in base classes
virtual wxBorder GetDefaultBorder() const { return wxRadioBoxBase::GetDefaultBorder(); }
// the buttons we contain // the buttons we contain
wxSubwindows *m_radioButtons; wxSubwindows *m_radioButtons;