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
This commit is contained in:
@@ -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
|
||||
|
@@ -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)
|
||||
|
Reference in New Issue
Block a user