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

diff --git a/include/wx/msw/radiobox.h b/include/wx/msw/radiobox.h
index d8007061419b4872afe4a25efd156dcf75bdb8ea..d2861471265f7a144a8f74c18337bcadd9243a31 100644 (file)
--- 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 23d05281d6de9d864cc7a1cfcf8a294f04723726..1220b5722ba5d6a60b0c2e34ab849f335e8ec567 100644 (file)
--- 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 );