Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing support for true children of wxStaticBox with wxStaticBoxSizer under osx_cocoa

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67029 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2011-02-26 15:44:14 +00:00
parent 7a69cf792b
commit 8591c94695
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/sizer.cpp
View File

@@ -2397,6 +2397,9 @@ void wxStaticBoxSizer::RecalcSizes()
// in the wxBoxSizer::RecalcSizes() call below using coordinates relative // in the wxBoxSizer::RecalcSizes() call below using coordinates relative
// to the top-left corner of the staticbox: // to the top-left corner of the staticbox:
m_position.x = m_position.y = 0; 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 #else
// if the wxStaticBox has childrens, then these windows must be placed // if the wxStaticBox has childrens, then these windows must be placed
// by the wxBoxSizer::RecalcSizes() call below using coordinates relative // by the wxBoxSizer::RecalcSizes() call below using coordinates relative

7
src/osx/statbox_osx.cpp
View File

@@ -40,6 +40,12 @@ bool wxStaticBox::Create( wxWindow *parent,
void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const 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 extraTop = -1; // Uninitted
static int other = 5; static int other = 5;
@@ -61,6 +67,7 @@ void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const
*borderTop += GetCharHeight(); *borderTop += GetCharHeight();
*borderOther = other; *borderOther = other;
#endif
} }
bool wxStaticBox::SetFont(const wxFont& font) bool wxStaticBox::SetFont(const wxFont& font)