From b0282524429ff336186d0e491a1dddc7fa207f44 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 23 Mar 2006 00:43:11 +0000 Subject: [PATCH] don't return true from wxRadioBox::AcceptsFocus() even when it's hidden/disabled git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38288 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/radiobox.h | 7 ++++--- include/wx/univ/radiobox.h | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/include/wx/msw/radiobox.h b/include/wx/msw/radiobox.h index d800706141..d286147126 100644 --- a/include/wx/msw/radiobox.h +++ b/include/wx/msw/radiobox.h @@ -59,7 +59,7 @@ public: style, val, name); } - ~wxRadioBox(); + virtual ~wxRadioBox(); bool Create(wxWindow *parent, wxWindowID id, @@ -100,8 +100,9 @@ public: virtual bool SetFont(const wxFont& font); virtual bool ContainsHWND(WXHWND hWnd) const; - // we inherit a version returning false from wxStaticBox, override it again - virtual bool AcceptsFocus() const { return true; } + // we inherit a version always returning false from wxStaticBox, override + // it to behave normally + virtual bool AcceptsFocus() const { return wxControl::AcceptsFocus(); } void SetLabelFont(const wxFont& WXUNUSED(font)) {} void SetButtonFont(const wxFont& font) { SetFont(font); } diff --git a/include/wx/univ/radiobox.h b/include/wx/univ/radiobox.h index 23d05281d6..1220b5722b 100644 --- a/include/wx/univ/radiobox.h +++ b/include/wx/univ/radiobox.h @@ -101,8 +101,9 @@ public: virtual wxString GetLabel() const; virtual void SetLabel(const wxString& label); - // we inherit a version returning false from wxStaticBox, override it again - virtual bool AcceptsFocus() const { return true; } + // we inherit a version always returning false from wxStaticBox, override + // it to behave normally + virtual bool AcceptsFocus() const { return wxControl::AcceptsFocus(); } #if wxUSE_TOOLTIPS virtual void DoSetToolTip( wxToolTip *tip ); -- 2.45.2