Have GetDescBoxHeight() return value consistent with one given to SetDescBoxHeight...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56088 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/propgrid/manager.cpp b/src/propgrid/manager.cpp
index d6b17107cba34dcc73a893fccd833dba31008ad3..68fed4406c29ff4f2e4043cdf53b3e6021e89307 100644 (file)
--- a/src/propgrid/manager.cpp
+++ b/src/propgrid/manager.cpp
@@ -1135,9 +1135,12 @@ void wxPropertyGridManager::SetDescBoxHeight( int ht, bool refresh )
 {
     if ( m_windowStyle & wxPG_DESCRIPTION )
     {
 {
     if ( m_windowStyle & wxPG_DESCRIPTION )
     {

-        m_nextDescBoxSize = ht;
-        if ( refresh )
-            RecalculatePositions(m_width, m_height);
+        if ( ht != GetDescBoxHeight() )
+        {
+            m_nextDescBoxSize = ht;
+            if ( refresh )
+                RecalculatePositions(m_width, m_height);
+        }

     }
 }
 
     }
 }
 


@@ -1145,7 +1148,7 @@ void wxPropertyGridManager::SetDescBoxHeight( int ht, bool refresh )
 
 int wxPropertyGridManager::GetDescBoxHeight() const
 {
 
 int wxPropertyGridManager::GetDescBoxHeight() const
 {

-    return GetClientSize().y - m_splitterY;
+    return GetClientSize().y - m_splitterY - m_splitterHeight;

 }
 
 // -----------------------------------------------------------------------
 }
 
 // -----------------------------------------------------------------------