wxWS_EX_VALIDATE_RECURSIVELY set by default if parent has it

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5758 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index 068a995fd34743da17e9b9b48819b2691cf0fb75..b41f60f7dcdfd82f5577834aaa11e2ce299b063a 100644 (file)
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -126,7 +126,7 @@ void wxWindowBase::InitBase()
 #if !defined(__WXMAC__) && !defined(__WXGTK__)
     m_font = *wxSWISS_FONT;         //      and this?
 #else
 #if !defined(__WXMAC__) && !defined(__WXGTK__)
     m_font = *wxSWISS_FONT;         //      and this?
 #else

-       m_font = settings.GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
+    m_font = settings.GetSystemFont(wxSYS_DEFAULT_GUI_FONT);

 #endif
 
     // no style bits
 #endif
 
     // no style bits


@@ -176,6 +176,15 @@ bool wxWindowBase::CreateBase(wxWindowBase *parent,
     m_windowId = id == -1 ? NewControlId() : id;
 
     SetName(name);
     m_windowId = id == -1 ? NewControlId() : id;
 
     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);
     SetParent(parent);
 
     SetWindowStyleFlag(style);
     SetParent(parent);