X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7c7a653bec7c85eccce74ee1dcb060011f5b51cf..cbffcf1117944db24ee8c196440702172dd0923f:/include/wx/statbox.h

diff --git a/include/wx/statbox.h b/include/wx/statbox.h
index c286ad829d..41d29b05b9 100644
--- a/include/wx/statbox.h
+++ b/include/wx/statbox.h
@@ -5,7 +5,7 @@
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBoxNameStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxStaticBoxNameStr;
 
 // ----------------------------------------------------------------------------
 // wxStaticBox: a grouping box with a label
@@ -20,6 +20,19 @@ public:
     virtual bool AcceptsFocus() const { return false; }
     virtual bool HasTransparentBackground() { return true; }
 
+    // implementation only: this is used by wxStaticBoxSizer to account for the
+    // need for extra space taken by the static box
+    //
+    // the top border is the margin at the top (where the title is),
+    // borderOther is the margin on all other sides
+    virtual void GetBordersForSizer(int *borderTop, int *borderOther) const
+    {
+        static const int BORDER = 5; // FIXME: hardcoded value
+
+        *borderTop = GetLabel().empty() ? BORDER : GetCharHeight();
+        *borderOther = BORDER;
+    }
+
 private:
     DECLARE_NO_COPY_CLASS(wxStaticBoxBase)
 };