diff --git a/include/wx/generic/spinctlg.h b/include/wx/generic/spinctlg.h
index 4360c9395c..19a78bb881 100644
--- a/include/wx/generic/spinctlg.h
+++ b/include/wx/generic/spinctlg.h
@@ -93,8 +93,10 @@ public:
     void OnTextChar(wxKeyEvent& event);
 
     // this window itself is used only as a container for its sub windows so it
-    // shouldn't accept the focus at all
+    // shouldn't accept the focus at all and any attempts to explicitly set
+    // focus to it should give focus to its text constol part
     virtual bool AcceptsFocus() const { return false; }
+    virtual void SetFocus() { if ( m_textCtrl ) m_textCtrl->SetFocus(); }
 
     friend class wxSpinCtrlTextGeneric;