From e94d46a67c64dd2798605ad8904de0f63a4aaf6d Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Wed, 26 Oct 2011 05:39:18 +0000 Subject: [PATCH] Work around a multiple inheritance ambiguity git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69544 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/osx/radiobox.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/wx/osx/radiobox.h b/include/wx/osx/radiobox.h index 6f9dcd4268..82ae33f127 100644 --- a/include/wx/osx/radiobox.h +++ b/include/wx/osx/radiobox.h @@ -89,6 +89,9 @@ public: void OnRadioButton( wxCommandEvent& event ) ; protected: + // resolve ambiguity in base classes + virtual wxBorder GetDefaultBorder() const { return wxRadioBoxBase::GetDefaultBorder(); } + wxRadioButton *m_radioButtonCycle; unsigned int m_noItems; -- 2.47.2