Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/statbox.h b/include/wx/statbox.h
index 203790654a6e0875a5632d66ba9a2d86e71495df..e1ea580b4be7aedcc3ea842050c8bfc93f2c497a 100644 (file)
--- a/include/wx/statbox.h
+++ b/include/wx/statbox.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        statbox.h
+// Name:        wx/statbox.h
 // Purpose:     wxStaticBox base header
 // Author:      Julian Smart
 // Modified by:
@@ -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
@@ -50,7 +50,7 @@ protected:
     // choose the default border for this window
     virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
 
-    DECLARE_NO_COPY_CLASS(wxStaticBoxBase)
+    wxDECLARE_NO_COPY_CLASS(wxStaticBoxBase);
 };
 
 #if defined(__WXUNIVERSAL__)