From 4ea366746bb0fdc232e5d44b5fc2938324a9d366 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 13 Oct 2012 22:51:27 +0000 Subject: [PATCH] Use WS_EX_CONTROLPARENT for wxStaticBox in wxMSW. This doesn't change anything currently but it seems correct to use this style with wxStaticBox as it can now contain other windows (and so be "control parent"), so it could allow Windows or other programs checking for this style to handle it more correctly. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72662 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/statbox.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp index d3e6b3cd3a..3a2d88de4c 100644 --- a/src/msw/statbox.cpp +++ b/src/msw/statbox.cpp @@ -99,11 +99,15 @@ WXDWORD wxStaticBox::MSWGetStyle(long style, WXDWORD *exstyle) const if ( exstyle ) { #ifndef __WXWINCE__ + // We may have children inside this static box, so use this style for + // TAB navigation to work if we ever use IsDialogMessage() to implement + // it (currently we don't because it's too buggy and implement TAB + // navigation ourselves, but this could change in the future). + *exstyle |= WS_EX_CONTROLPARENT; + if (wxSystemOptions::IsFalse(wxT("msw.staticbox.optimized-paint"))) - *exstyle = WS_EX_TRANSPARENT; - else + *exstyle |= WS_EX_TRANSPARENT; #endif - *exstyle = 0; } styleWin |= BS_GROUPBOX; -- 2.45.2