Applied rowspan patch #15276 (dghart)

[wxWidgets.git] / include / wx / statbox.h

diff --git a/include/wx/statbox.h b/include/wx/statbox.h
index 8c4043b23c5ea17cf6f07bb950a19c9faa8708fb..e1ea580b4be7aedcc3ea842050c8bfc93f2c497a 100644 (file)
--- a/include/wx/statbox.h
+++ b/include/wx/statbox.h
@@ -17,6 +17,7 @@
 #if wxUSE_STATBOX
 
 #include "wx/control.h"
+#include "wx/containr.h"
 
 extern WXDLLIMPEXP_DATA_CORE(const char) wxStaticBoxNameStr[];
 
@@ -24,13 +25,12 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxStaticBoxNameStr[];
 // wxStaticBox: a grouping box with a label
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxStaticBoxBase : public wxControl
+class WXDLLIMPEXP_CORE wxStaticBoxBase : public wxNavigationEnabled<wxControl>
 {
 public:
-    wxStaticBoxBase() { }
+    wxStaticBoxBase() { m_container.DisableSelfFocus(); }
 
-    // overriden base class virtuals
-    virtual bool AcceptsFocus() const { return false; }
+    // overridden base class virtuals
     virtual bool HasTransparentBackground() { return true; }
 
     // implementation only: this is used by wxStaticBoxSizer to account for the