From 2f383eaa7d3000513a6a3675ec731a99099cd0a3 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 27 Mar 2009 22:37:22 +0000 Subject: [PATCH] don't reset WS_EX_CONTROLPARENT bit in wxNotebook::MSWGetStyle(), this can result in freezing the program git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@59897 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/notebook.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp index ff7022558c..a231fe161b 100644 --- a/src/msw/notebook.cpp +++ b/src/msw/notebook.cpp @@ -421,12 +421,11 @@ WXDWORD wxNotebook::MSWGetStyle(long style, WXDWORD *exstyle) const else if ( style & wxBK_RIGHT ) tabStyle |= TCS_VERTICAL | TCS_RIGHT; - // ex style if ( exstyle ) { // note that we never want to have the default WS_EX_CLIENTEDGE style // as it looks too ugly for the notebooks - *exstyle = 0; + *exstyle &= ~WS_EX_CLIENTEDGE; } return tabStyle;