A few tweaks and cleanups

[wxWidgets.git] / src / generic / scrlwing.cpp

diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp
index c17909a7094eac716811b2e668e0472398334997..904104e3713b42dbc0b3e74a7d6b94e2259c0ea9 100644 (file)
--- a/src/generic/scrlwing.cpp
+++ b/src/generic/scrlwing.cpp
@@ -40,6 +40,7 @@
 #include "wx/scrolwin.h"
 #include "wx/panel.h"
 #include "wx/timer.h"
+#include "wx/sizer.h"
 
 #ifdef __WXMSW__
     #include <windows.h> // for DLGC_WANTARROWS
@@ -798,10 +799,24 @@ void wxScrollHelper::EnableScrolling (bool x_scroll, bool y_scroll)
 
 void wxScrollHelper::GetVirtualSize (int *x, int *y) const
 {
+    wxSize sz(0, 0);
+    if (m_targetWindow)
+        sz = m_targetWindow->GetClientSize();
+
     if ( x )
-        *x = m_xScrollPixelsPerLine * m_xScrollLines;
+    {
+        if (m_xScrollPixelsPerLine == 0)
+            *x = sz.x;
+        else
+            *x = m_xScrollPixelsPerLine * m_xScrollLines;
+    }
     if ( y )
-        *y = m_yScrollPixelsPerLine * m_yScrollLines;
+    {
+        if (m_yScrollPixelsPerLine == 0)
+            *y = sz.y;
+        else
+            *y = m_yScrollPixelsPerLine * m_yScrollLines;
+    }
 }
 
 // Where the current view starts from
@@ -813,7 +828,7 @@ void wxScrollHelper::GetViewStart (int *x, int *y) const
         *y = m_yScrollPosition;
 }
 
-void wxScrollHelper::CalcScrolledPosition(int x, int y, int *xx, int *yy) const
+void wxScrollHelper::DoCalcScrolledPosition(int x, int y, int *xx, int *yy) const
 {
     if ( xx )
         *xx = x - m_xScrollPosition * m_xScrollPixelsPerLine;
@@ -821,7 +836,7 @@ void wxScrollHelper::CalcScrolledPosition(int x, int y, int *xx, int *yy) const
         *yy = y - m_yScrollPosition * m_yScrollPixelsPerLine;
 }
 
-void wxScrollHelper::CalcUnscrolledPosition(int x, int y, int *xx, int *yy) const
+void wxScrollHelper::DoCalcUnscrolledPosition(int x, int y, int *xx, int *yy) const
 {
     if ( xx )
         *xx = x + m_xScrollPosition * m_xScrollPixelsPerLine;
@@ -1115,8 +1130,9 @@ bool wxGenericScrolledWindow::Layout()
         GetSizer()->SetDimension(x, y, w, h);
         return TRUE;
     }
-    else
-        return wxPanel::Layout();  // fall back to default for LayoutConstraints
+
+    // fall back to default for LayoutConstraints
+    return wxPanel::Layout();
 }
 
 void wxGenericScrolledWindow::OnPaint(wxPaintEvent& event)