Made wxBORDER_THEME the same as wxBORDER_DEFAULT
Moved wxControl::GetBorderStyle into wxWindowMSW::GetBorderStyle but added GetBorderStyle to have the same behaviour as before (so e.g. notebook panels don't get borders) Improved help window borders git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47963 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1286,6 +1286,11 @@ void wxWindowMSW::MSWUpdateStyle(long flagsOld, long exflagsOld)
|
||||
}
|
||||
}
|
||||
|
||||
wxBorder wxWindowMSW::GetDefaultBorder() const
|
||||
{
|
||||
return GetDefaultBorderForControl();
|
||||
}
|
||||
|
||||
wxBorder wxWindowMSW::GetDefaultBorderForControl() const
|
||||
{
|
||||
// we want to automatically give controls a sunken style (confusingly,
|
||||
@@ -1354,14 +1359,11 @@ WXDWORD wxWindowMSW::MSWGetStyle(long flags, WXDWORD *exstyle) const
|
||||
|
||||
switch ( border )
|
||||
{
|
||||
default:
|
||||
case wxBORDER_DEFAULT:
|
||||
wxFAIL_MSG( _T("unknown border style") );
|
||||
// fall through
|
||||
case wxBORDER_DEFAULT: // also wxBORDER_THEME
|
||||
break;
|
||||
|
||||
case wxBORDER_NONE:
|
||||
case wxBORDER_SIMPLE:
|
||||
case wxBORDER_THEME:
|
||||
break;
|
||||
|
||||
case wxBORDER_STATIC:
|
||||
@@ -1377,6 +1379,10 @@ WXDWORD wxWindowMSW::MSWGetStyle(long flags, WXDWORD *exstyle) const
|
||||
style &= ~WS_BORDER;
|
||||
break;
|
||||
|
||||
default:
|
||||
wxFAIL_MSG( _T("unknown border style") );
|
||||
break;
|
||||
|
||||
// case wxBORDER_DOUBLE:
|
||||
// *exstyle |= WS_EX_DLGMODALFRAME;
|
||||
// break;
|
||||
|
Reference in New Issue
Block a user