Miserable hack around problem when shrinking

    a scrolled window with child windows when
    it was maxiamally scrolled.

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

diff --git a/src/gtk/scrolwin.cpp b/src/gtk/scrolwin.cpp
index 222c399fc3cd0aa90033d65ac50f6fd64592abff..a072691442e23fc90796e1440178572b146640e8 100644 (file)
--- a/src/gtk/scrolwin.cpp
+++ b/src/gtk/scrolwin.cpp
@@ -383,8 +383,11 @@ void wxScrolledWindow::AdjustScrollbars()
 
         if( m_hAdjust->value + m_hAdjust->page_size > m_hAdjust->upper )
         {
 
         if( m_hAdjust->value + m_hAdjust->page_size > m_hAdjust->upper )
         {

-            m_hAdjust->value = m_hAdjust->upper - m_hAdjust->page_size;
-            m_xScrollPosition = (int)m_hAdjust->value;
+            if (GetChildren().GetCount() == 0)
+            {
+                m_hAdjust->value = m_hAdjust->upper - m_hAdjust->page_size;
+                m_xScrollPosition = (int)m_hAdjust->value;
+            }

         }
     }
 
         }
     }
 


@@ -400,8 +403,11 @@ void wxScrolledWindow::AdjustScrollbars()
 
         if( m_vAdjust->value + m_vAdjust->page_size > m_vAdjust->upper )
         {
 
         if( m_vAdjust->value + m_vAdjust->page_size > m_vAdjust->upper )
         {

-            m_vAdjust->value = m_vAdjust->upper - m_vAdjust->page_size;
-            m_yScrollPosition = (int)m_vAdjust->value;
+            if (GetChildren().GetCount() == 0)
+            {
+                m_vAdjust->value = m_vAdjust->upper - m_vAdjust->page_size;
+                m_yScrollPosition = (int)m_vAdjust->value;
+            }

         }
     }
 
         }
     }
 

diff --git a/src/gtk1/scrolwin.cpp b/src/gtk1/scrolwin.cpp
index 222c399fc3cd0aa90033d65ac50f6fd64592abff..a072691442e23fc90796e1440178572b146640e8 100644 (file)
--- a/src/gtk1/scrolwin.cpp
+++ b/src/gtk1/scrolwin.cpp
@@ -383,8 +383,11 @@ void wxScrolledWindow::AdjustScrollbars()
 
         if( m_hAdjust->value + m_hAdjust->page_size > m_hAdjust->upper )
         {
 
         if( m_hAdjust->value + m_hAdjust->page_size > m_hAdjust->upper )
         {

-            m_hAdjust->value = m_hAdjust->upper - m_hAdjust->page_size;
-            m_xScrollPosition = (int)m_hAdjust->value;
+            if (GetChildren().GetCount() == 0)
+            {
+                m_hAdjust->value = m_hAdjust->upper - m_hAdjust->page_size;
+                m_xScrollPosition = (int)m_hAdjust->value;
+            }

         }
     }
 
         }
     }
 


@@ -400,8 +403,11 @@ void wxScrolledWindow::AdjustScrollbars()
 
         if( m_vAdjust->value + m_vAdjust->page_size > m_vAdjust->upper )
         {
 
         if( m_vAdjust->value + m_vAdjust->page_size > m_vAdjust->upper )
         {

-            m_vAdjust->value = m_vAdjust->upper - m_vAdjust->page_size;
-            m_yScrollPosition = (int)m_vAdjust->value;
+            if (GetChildren().GetCount() == 0)
+            {
+                m_vAdjust->value = m_vAdjust->upper - m_vAdjust->page_size;
+                m_yScrollPosition = (int)m_vAdjust->value;
+            }

         }
     }
 
         }
     }