fixed compilation warnings with GTK+ 2.0

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

diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp
index 43f061c2d676f4f07e676aa85ae59de323435f1f..b19d93d85b57860fa5e4571a2fb6f9abaa19428a 100644 (file)
--- a/src/generic/scrlwing.cpp
+++ b/src/generic/scrlwing.cpp
@@ -814,7 +814,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;
@@ -822,7 +822,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;
@@ -1116,8 +1116,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)