tell that there was an error...

[wxWidgets.git] / src / gtk1 / scrolwin.cpp

diff --git a/src/gtk1/scrolwin.cpp b/src/gtk1/scrolwin.cpp
index 0a5ec3f800557ae395d8a7416b14c4da8eda6e7c..a072691442e23fc90796e1440178572b146640e8 100644 (file)
--- a/src/gtk1/scrolwin.cpp
+++ b/src/gtk1/scrolwin.cpp
@@ -325,6 +325,11 @@ void wxScrolledWindow::DoSetVirtualSize( int x, int y )
 {
     wxPanel::DoSetVirtualSize( x, y );
     AdjustScrollbars();
 {
     wxPanel::DoSetVirtualSize( x, y );
     AdjustScrollbars();

+
+#if wxUSE_CONSTRAINTS
+    if (GetAutoLayout())
+        Layout();
+#endif

 }
 
 /*
 }
 
 /*


@@ -378,9 +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_targetWindow->ScrollWindow( (m_xScrollPosition - m_hAdjust->value) * m_xScrollPixelsPerLine, 0 );
-            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;
+            }

         }
     }
 
         }
     }
 


@@ -396,9 +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_targetWindow->ScrollWindow( 0, (m_yScrollPosition - m_vAdjust->value) * m_yScrollPixelsPerLine );
-            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;
+            }

         }
     }
 
         }
     }
 


@@ -818,11 +827,6 @@ void wxScrolledWindow::OnSize(wxSizeEvent& WXUNUSED(event))
         m_targetWindow->SetVirtualSize( m_targetWindow->GetClientSize() );
 
     SetVirtualSize( GetClientSize() );
         m_targetWindow->SetVirtualSize( m_targetWindow->GetClientSize() );
 
     SetVirtualSize( GetClientSize() );

-
-#if wxUSE_CONSTRAINTS
-    if (GetAutoLayout())
-        Layout();
-#endif

 }
 
 // This calls OnDraw, having adjusted the origin according to the current
 }
 
 // This calls OnDraw, having adjusted the origin according to the current