From 98b9643647468b3670c87e2d15dcba5c0fe32d11 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Sun, 31 Mar 2002 14:06:32 +0000 Subject: [PATCH] Minor tweak (up-ported from 2.2.9) to make flat toolbars look slightly better even without rebar controls underneath. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14879 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/frame.cpp | 2 ++ src/msw/tbar95.cpp | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp index f6344c7c0c..2784af2f23 100644 --- a/src/msw/frame.cpp +++ b/src/msw/frame.cpp @@ -495,6 +495,8 @@ void wxFrame::PositionToolBar() else { tw = width; + if ( toolbar->GetWindowStyleFlag() & wxTB_FLAT ) + th -= 3; } // use the 'real' MSW position here, don't offset relativly to the diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp index 13b388e509..004af499a5 100644 --- a/src/msw/tbar95.cpp +++ b/src/msw/tbar95.cpp @@ -1177,7 +1177,10 @@ bool wxToolBar::HandleSize(WXWPARAM wParam, WXLPARAM lParam) else { w = LOWORD(lParam); - h = r.bottom - r.top; + if (HasFlag( wxTB_FLAT )) + h = r.bottom - r.top - 3; + else + h = r.bottom - r.top; if ( m_maxRows ) { // FIXME: 6 is hardcoded separator line height... -- 2.45.2