Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/statbox.h b/include/wx/statbox.h
index 362aeb7b1776e8437ff5f019c406374bb7571623..e1ea580b4be7aedcc3ea842050c8bfc93f2c497a 100644 (file)
--- a/include/wx/statbox.h
+++ b/include/wx/statbox.h
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        statbox.h
+// Name:        wx/statbox.h
 // Purpose:     wxStaticBox base header
-// Author:      wxWidgets Team
+// Author:      Julian Smart
 // Modified by:
 // Created:
-// Copyright:   (c) wxWidgets Team
+// Copyright:   (c) Julian Smart
 // RCS-ID:      $Id$
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -17,20 +17,20 @@
 #if wxUSE_STATBOX
 
 #include "wx/control.h"
+#include "wx/containr.h"
 
-extern WXDLLEXPORT_DATA(const wxChar*) wxStaticBoxNameStr;
+extern WXDLLIMPEXP_DATA_CORE(const char) wxStaticBoxNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxStaticBox: a grouping box with a label
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT 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
@@ -40,14 +40,17 @@ public:
     // borderOther is the margin on all other sides
     virtual void GetBordersForSizer(int *borderTop, int *borderOther) const
     {
-        static const int BORDER = 5; // FIXME: hardcoded value
+        const int BORDER = 5; // FIXME: hardcoded value
 
         *borderTop = GetLabel().empty() ? BORDER : GetCharHeight();
         *borderOther = BORDER;
     }
 
-private:
-    DECLARE_NO_COPY_CLASS(wxStaticBoxBase)
+protected:
+    // choose the default border for this window
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+
+    wxDECLARE_NO_COPY_CLASS(wxStaticBoxBase);
 };
 
 #if defined(__WXUNIVERSAL__)
@@ -56,10 +59,12 @@ private:
     #include "wx/msw/statbox.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/statbox.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
     #include "wx/gtk/statbox.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/statbox.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/statbox.h"
+    #include "wx/osx/statbox.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/statbox.h"
 #elif defined(__WXPM__)