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

diff --git a/include/wx/statbox.h b/include/wx/statbox.h
index c286ad829d..362aeb7b17 100644
--- a/include/wx/statbox.h
+++ b/include/wx/statbox.h
@@ -1,11 +1,24 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        statbox.h
+// Purpose:     wxStaticBox base header
+// Author:      wxWidgets Team
+// Modified by:
+// Created:
+// Copyright:   (c) wxWidgets Team
+// RCS-ID:      $Id$
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
 #ifndef _WX_STATBOX_H_BASE_
 #define _WX_STATBOX_H_BASE_
 
+#include "wx/defs.h"
+
 #if wxUSE_STATBOX
 
 #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 +33,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)
 };