Work around a multiple inheritance ambiguity

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

diff --git a/include/wx/osx/radiobox.h b/include/wx/osx/radiobox.h
index 6f9dcd42684bc2d433a086c6cf95169d117ea9f5..82ae33f1278fa51655f45df801ad4556d11a3701 100644 (file)
--- a/include/wx/osx/radiobox.h
+++ b/include/wx/osx/radiobox.h
@@ -89,6 +89,9 @@ public:
     void OnRadioButton( wxCommandEvent& event ) ;
 
 protected:
     void OnRadioButton( wxCommandEvent& event ) ;
 
 protected:

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

     wxRadioButton    *m_radioButtonCycle;
 
     unsigned int      m_noItems;
     wxRadioButton    *m_radioButtonCycle;
 
     unsigned int      m_noItems;