From ddc170523ced4a01270ad46e006180516b8e3250 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 31 Jan 2009 13:53:50 +0000
Subject: [PATCH] don't override the toolbar height with too small value
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58550 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
src/propgrid/manager.cpp | 19 +------------------
1 file changed, 1 insertion(+), 18 deletions(-)
diff --git a/src/propgrid/manager.cpp b/src/propgrid/manager.cpp
index cb2c519d70..025e7be845 100644
--- a/src/propgrid/manager.cpp
+++ b/src/propgrid/manager.cpp
@@ -1061,24 +1061,7 @@ void wxPropertyGridManager::RecalculatePositions( int width, int height )
#if wxUSE_TOOLBAR
if ( m_pToolbar )
{
- int tbHeight;
-
- #if ( wxMINOR_VERSION < 6 || (wxMINOR_VERSION == 6 && wxRELEASE_NUMBER < 2) )
- tbHeight = -1;
- #else
- // In wxWidgets 2.6.2+, Toolbar default height may be broken
- #if defined(__WXMSW__)
- tbHeight = 24;
- #elif defined(__WXGTK__)
- tbHeight = -1; // 22;
- #elif defined(__WXMAC__)
- tbHeight = 22;
- #else
- tbHeight = 22;
- #endif
- #endif
-
- m_pToolbar->SetSize(0,0,width,tbHeight);
+ m_pToolbar->SetSize(0, 0, width, -1);
propgridY += m_pToolbar->GetSize().y;
}
#endif
--
2.47.2