From 8591c946952a90363546812d2d9bf5549733649e Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Sat, 26 Feb 2011 15:44:14 +0000 Subject: [PATCH] fixing support for true children of wxStaticBox with wxStaticBoxSizer under osx_cocoa git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67029 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/sizer.cpp | 3 +++ src/osx/statbox_osx.cpp | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp index 1291915515..77e3b8c34e 100644 --- a/src/common/sizer.cpp +++ b/src/common/sizer.cpp @@ -2397,6 +2397,9 @@ void wxStaticBoxSizer::RecalcSizes() // in the wxBoxSizer::RecalcSizes() call below using coordinates relative // to the top-left corner of the staticbox: m_position.x = m_position.y = 0; +#elif defined(__WXOSX__) && wxOSX_USE_COCOA + // the distance from the 'inner' content view to the embedded controls + m_position.x = m_position.y = 10; #else // if the wxStaticBox has childrens, then these windows must be placed // by the wxBoxSizer::RecalcSizes() call below using coordinates relative diff --git a/src/osx/statbox_osx.cpp b/src/osx/statbox_osx.cpp index f6df81bcac..c20d08e086 100644 --- a/src/osx/statbox_osx.cpp +++ b/src/osx/statbox_osx.cpp @@ -40,6 +40,12 @@ bool wxStaticBox::Create( wxWindow *parent, void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const { +#if wxOSX_USE_COCOA + int l,t,w,h; + m_peer->GetContentArea(l, t, w, h); + *borderTop = t + 10; + *borderOther = l + 10; +#else static int extraTop = -1; // Uninitted static int other = 5; @@ -61,6 +67,7 @@ void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const *borderTop += GetCharHeight(); *borderOther = other; +#endif } bool wxStaticBox::SetFont(const wxFont& font) -- 2.45.2