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 e6e1c1ae1060f335e982691ced7bb2da9af7e23f..2edf86df4f2ba161ba70e5848309baeee6c8a5a2 100644 (file)
--- a/include/wx/msw/radiobox.h
+++ b/include/wx/msw/radiobox.h
@@ -163,6 +163,8 @@ protected:
     virtual WXHRGN MSWGetRegionWithoutChildren();
 #endif // __WXWINCE__
 
     virtual WXHRGN MSWGetRegionWithoutChildren();
 #endif // __WXWINCE__
 

+    // resolve ambiguity in base classes
+    virtual wxBorder GetDefaultBorder() const { return wxRadioBoxBase::GetDefaultBorder(); }

 
     // the buttons we contain
     wxSubwindows *m_radioButtons;
 
     // the buttons we contain
     wxSubwindows *m_radioButtons;