From f30d4a74217be927c4a0f1997e7ea8c38d48ce4e Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Mon, 16 Jun 2003 22:08:01 +0000 Subject: [PATCH] Remove the test for parent window type when checking if to give a sunken style automatically git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@21184 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/window.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/msw/window.cpp b/src/msw/window.cpp index 276de2190c..61cd0282a0 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -1164,25 +1164,24 @@ WXDWORD wxWindowMSW::MSWGetStyle(long flags, WXDWORD *exstyle) const style |= WS_HSCROLL; wxBorder border = (wxBorder)(flags & wxBORDER_MASK); - + // Check if we want to automatically give it a sunken style. // Note than because 'sunken' actually maps to WS_EX_CLIENTEDGE, which // is a more neutral term, we don't necessarily get a sunken effect in // Windows XP. Instead we get the appropriate style for the theme. - if (border == wxBORDER_DEFAULT && wxTheApp->GetAuto3D() && + if (border == wxBORDER_DEFAULT && wxTheApp->GetAuto3D() && IsKindOf(CLASSINFO(wxControl)) && - GetParent() && (GetParent()->IsKindOf(CLASSINFO(wxPanel)) || - GetParent()->IsKindOf(CLASSINFO(wxDialog))) && + GetParent() && ((GetParent()->GetWindowStyleFlag() & wxUSER_COLOURS) != wxUSER_COLOURS)) { border = (wxBorder)((flags & wxBORDER_MASK) | wxBORDER_SUNKEN); - } - + } + // Only give it WS_BORDER for wxBORDER_SIMPLE if (border & wxBORDER_SIMPLE) style |= WS_BORDER; - + // now deal with ext style if the caller wants it if ( exstyle ) {