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

Take wxBORDER_THEME, and the default border style, into account

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49910 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2007-11-13 14:51:14 +00:00
parent cce69fec84
commit 431e319cc6
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/univ/stdrend.cpp
View File

@ -413,13 +413,17 @@ void wxStdRenderer::DrawBorder(wxDC& dc,
switch ( border )
{
case wxBORDER_SUNKEN:
case wxBORDER_THEME:
DrawSunkenBorder(dc, &rect);
break;
// wxBORDER_DOUBLE and wxBORDER_THEME are currently the same value.
#if 0
case wxBORDER_DOUBLE:
DrawAntiSunkenBorder(dc, &rect);
DrawExtraBorder(dc, &rect);
break;
#endif
case wxBORDER_STATIC:
DrawStaticBorder(dc, &rect);
@ -458,6 +462,7 @@ wxRect wxStdRenderer::GetBorderDimensions(wxBorder border) const
case wxBORDER_RAISED:
case wxBORDER_SUNKEN:
case wxBORDER_THEME:
width = 2;
break;

5
src/univ/themes/mono.cpp
View File

@ -650,13 +650,14 @@ wxRect wxMonoRenderer::GetBorderDimensions(wxBorder border) const
case wxBORDER_STATIC:
case wxBORDER_RAISED:
case wxBORDER_SUNKEN:
case wxBORDER_THEME:
width = 1;
break;
/*
case wxBORDER_DOUBLE:
width = 2;
break;
*/
default:
wxFAIL_MSG(_T("unknown border type"));
// fall through

7
src/univ/winuniv.cpp
View File

@ -145,6 +145,11 @@ bool wxWindow::Create(wxWindow *parent,
long style,
const wxString& name)
{
// Get default border
wxBorder border = GetBorder(style);
style &= ~wxBORDER_MASK;
style |= border;
long actualStyle = style;
// we add wxCLIP_CHILDREN to get the same ("natural") behaviour under MSW
@ -665,7 +670,7 @@ void wxWindow::OnSize(wxSizeEvent& event)
}
}
else
if (HasFlag( wxSUNKEN_BORDER ) || HasFlag( wxRAISED_BORDER ))
if (HasFlag( wxSUNKEN_BORDER ) || HasFlag( wxRAISED_BORDER ) || HasFlag( wxBORDER_THEME ))
{
if (newSize.y > m_oldSize.y)
{