From d13c32e99d20b8282f590b5f5beef50b63662e5a Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Tue, 23 Mar 1999 09:14:07 +0000 Subject: [PATCH] WS_CLIPCHILDREN is not always enabled in wxNotebook (caused painting problems). Memory leak checking in app.cpp (wxMSW) now does checking from last checkpoint. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1957 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/app.cpp | 2 +- src/msw/notebook.cpp | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/msw/app.cpp b/src/msw/app.cpp index 516e779441..3ea5ea7362 100644 --- a/src/msw/app.cpp +++ b/src/msw/app.cpp @@ -557,7 +557,7 @@ void wxApp::CleanUp() // blocks that aren't part of the wxDebugContext itself, // as a special case. Then when dumping we need to ignore // wxDebugContext, too. - if (wxDebugContext::CountObjectsLeft() > 0) + if (wxDebugContext::CountObjectsLeft(TRUE) > 0) { wxLogDebug("There were memory leaks."); wxDebugContext::Dump(); diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp index 4a1d57d6b7..049703b142 100644 --- a/src/msw/notebook.cpp +++ b/src/msw/notebook.cpp @@ -133,7 +133,10 @@ bool wxNotebook::Create(wxWindow *parent, // style m_windowStyle = style | wxTAB_TRAVERSAL; - long tabStyle = WS_CHILD | WS_VISIBLE | WS_TABSTOP | TCS_TABS | WS_CLIPCHILDREN; + long tabStyle = WS_CHILD | WS_VISIBLE | WS_TABSTOP | TCS_TABS; + + if (m_windowStyle & wxCLIP_CHILDREN) + tabStyle |= WS_CLIPCHILDREN; if ( m_windowStyle & wxTC_MULTILINE ) tabStyle |= TCS_MULTILINE; if ( m_windowStyle & wxBORDER ) -- 2.47.2