fixed bug with propagating wxWS_EX_VALIDATE_RECURSIVELY
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5823 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -176,15 +176,6 @@ bool wxWindowBase::CreateBase(wxWindowBase *parent,
|
|||||||
m_windowId = id == -1 ? NewControlId() : id;
|
m_windowId = id == -1 ? NewControlId() : id;
|
||||||
|
|
||||||
SetName(name);
|
SetName(name);
|
||||||
|
|
||||||
// if the parent window has wxWS_EX_VALIDATE_RECURSIVELY set, we want to
|
|
||||||
// have it too - like this it's possible to set it only in the top level
|
|
||||||
// dialog/frame and all children will inherit it by defult
|
|
||||||
if ( parent && (parent->GetWindowStyle() & wxWS_EX_VALIDATE_RECURSIVELY) )
|
|
||||||
{
|
|
||||||
style |= wxWS_EX_VALIDATE_RECURSIVELY;
|
|
||||||
}
|
|
||||||
|
|
||||||
SetWindowStyleFlag(style);
|
SetWindowStyleFlag(style);
|
||||||
SetParent(parent);
|
SetParent(parent);
|
||||||
|
|
||||||
@@ -192,6 +183,14 @@ bool wxWindowBase::CreateBase(wxWindowBase *parent,
|
|||||||
SetValidator(validator);
|
SetValidator(validator);
|
||||||
#endif // wxUSE_VALIDATORS
|
#endif // wxUSE_VALIDATORS
|
||||||
|
|
||||||
|
// if the parent window has wxWS_EX_VALIDATE_RECURSIVELY set, we want to
|
||||||
|
// have it too - like this it's possible to set it only in the top level
|
||||||
|
// dialog/frame and all children will inherit it by defult
|
||||||
|
if ( parent && (parent->GetExtraStyle() & wxWS_EX_VALIDATE_RECURSIVELY) )
|
||||||
|
{
|
||||||
|
SetExtraStyle(wxWS_EX_VALIDATE_RECURSIVELY);
|
||||||
|
}
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user