From: Robin Dunn <robin@alldunn.com>
Date: Sat, 29 Oct 2011 04:50:04 +0000 (+0000)
Subject: resolve multiple inheritance ambiguity
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/c78f0857639ac0f14a1c4cc3eaa48cde46dac9f2?ds=sidebyside

resolve multiple inheritance ambiguity

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69573 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/msw/radiobox.h b/include/wx/msw/radiobox.h
index e6e1c1ae10..2edf86df4f 100644
--- a/include/wx/msw/radiobox.h
+++ b/include/wx/msw/radiobox.h
@@ -163,6 +163,8 @@ protected:
     virtual WXHRGN MSWGetRegionWithoutChildren();
 #endif // __WXWINCE__
 
+    // resolve ambiguity in base classes
+    virtual wxBorder GetDefaultBorder() const { return wxRadioBoxBase::GetDefaultBorder(); }
 
     // the buttons we contain
     wxSubwindows *m_radioButtons;