Cast needed to fix compilation on 10.4 --This line, and those below,

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

diff --git a/src/generic/vscroll.cpp b/src/generic/vscroll.cpp
index 50bb4c1c6d1785eb567cc2bd951faa59580e8f6a..a4256ef8049dd11511e4645cbaef19a9dd88d03c 100644 (file)
--- a/src/generic/vscroll.cpp
+++ b/src/generic/vscroll.cpp
@@ -53,7 +53,7 @@ public:
 private:
     wxVarScrollHelperBase *m_scrollHelper;
 
 private:
     wxVarScrollHelperBase *m_scrollHelper;
 

-    DECLARE_NO_COPY_CLASS(wxVarScrollHelperEvtHandler)
+    wxDECLARE_NO_COPY_CLASS(wxVarScrollHelperEvtHandler);

 };
 
 // ============================================================================
 };
 
 // ============================================================================


@@ -155,7 +155,7 @@ wxVarScrollHelperBase::wxVarScrollHelperBase(wxWindow *win)
     m_unitFirst = 0;
 
     m_win =
     m_unitFirst = 0;
 
     m_win =

-    m_targetWindow = (wxWindow *)NULL;
+    m_targetWindow = NULL;

 
     m_physicalScrolling = true;
     m_handler = NULL;
 
     m_physicalScrolling = true;
     m_handler = NULL;


@@ -592,8 +592,8 @@ bool wxVarScrollHelperBase::DoScrollToUnit(size_t unit)
     // finally refresh the display -- but only redraw as few units as possible
     // to avoid flicker.  We can't do this if we have children because they
     // won't be scrolled
     // finally refresh the display -- but only redraw as few units as possible
     // to avoid flicker.  We can't do this if we have children because they
     // won't be scrolled

-    if ( (m_targetWindow->GetChildren().empty() &&
-         GetVisibleBegin() >= unitLastOld) || GetVisibleEnd() <= unitFirstOld )
+    if ( m_targetWindow->GetChildren().empty() &&
+         (GetVisibleBegin() >= unitLastOld || GetVisibleEnd() <= unitFirstOld) )

     {
         // the simplest case: we don't have any old units left, just redraw
         // everything
     {
         // the simplest case: we don't have any old units left, just redraw
         // everything