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

Added wxStaticBoxSizer,

Browse Source 
Makefile updates,
  Improved look of wxGenericPageSetupDialog


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3369 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-08-13 17:32:30 +00:00
parent 4cb122de97
commit 27ea1d8aae
7 changed files with 217 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/common/sizer.cpp
View File

@@ -22,6 +22,7 @@
#include "wx/sizer.h"
#include "wx/utils.h"
#include "wx/statbox.h"
//---------------------------------------------------------------------------
// wxSizerItem
@@ -384,3 +385,55 @@ wxSize wxBoxSizer::CalcMin()
return wxSize( m_minWidth, m_minHeight );
}
//---------------------------------------------------------------------------
// wxStaticBoxSizer
//---------------------------------------------------------------------------
wxStaticBoxSizer::wxStaticBoxSizer( wxStaticBox *box, int orient )
: wxBoxSizer( orient )
{
wxASSERT_MSG( box, _T("wxStaticBoxSizer needs a static box") );
m_staticBox = box;
}
void wxStaticBoxSizer::RecalcSizes()
{
// this will have to be done platform by platform
// as there is no way to guess the thickness of
// a wxStaticBox border
int top_border = 15;
if (m_staticBox->GetLabel().IsEmpty()) top_border = 5;
int other_border = 5;
m_staticBox->SetSize( m_position.x, m_position.y, m_size.x, m_size.y );
wxPoint old_pos( m_position );
m_position.x += other_border;
m_position.y += top_border;
wxSize old_size( m_size );
m_size.x -= 2*other_border;
m_size.y -= top_border + other_border;
wxBoxSizer::RecalcSizes();
m_position = old_pos;
m_size = old_size;
}
wxSize wxStaticBoxSizer::CalcMin()
{
// this will have to be done platform by platform
// as there is no way to guess the thickness of
// a wxStaticBox border
int top_border = 15;
if (m_staticBox->GetLabel().IsEmpty()) top_border = 5;
int other_border = 5;
wxSize ret( wxBoxSizer::CalcMin() );
ret.x += 2*top_border;
ret.y += other_border + top_border;
return ret;
}