Some new interfaces in common code requires an updated module definition file.

[wxWidgets.git] / contrib / src / gizmos / splittree.cpp

diff --git a/contrib/src/gizmos/splittree.cpp b/contrib/src/gizmos/splittree.cpp
index b7197607b553d4f7d55826b82874b0a63383ac0b..a99b6733c8198c6c625c0bd191b4a07cb1c3e1d9 100644 (file)
--- a/contrib/src/gizmos/splittree.cpp
+++ b/contrib/src/gizmos/splittree.cpp
@@ -338,7 +338,7 @@ void wxRemotelyScrolledTreeCtrl::OnScroll(wxScrollWinEvent& event)
     int orient = event.GetOrientation();
     if (orient == wxHORIZONTAL)
     {
     int orient = event.GetOrientation();
     if (orient == wxHORIZONTAL)
     {

-        // Don't 'skip' or we'd get into infinite recursion
+        event.Skip();

         return;
     }
     wxScrolledWindow* scrollWin = GetScrolledWindow();
         return;
     }
     wxScrolledWindow* scrollWin = GetScrolledWindow();


@@ -427,7 +427,7 @@ void wxTreeCompanionWindow::OnPaint(wxPaintEvent& event)
                        dc.DrawLine(0, cy, clientSize.x, cy);
                }
        }
                        dc.DrawLine(0, cy, clientSize.x, cy);
                }
        }

-       if (m_treeCtrl->GetBoundingRect(lastH, itemRect))
+       if (lastH.IsOk() && m_treeCtrl->GetBoundingRect(lastH, itemRect))

        {
                cy = itemRect.GetBottom();
                dc.DrawLine(0, cy, clientSize.x, cy);
        {
                cy = itemRect.GetBottom();
                dc.DrawLine(0, cy, clientSize.x, cy);


@@ -439,7 +439,7 @@ void wxTreeCompanionWindow::OnScroll(wxScrollWinEvent& event)
     int orient = event.GetOrientation();
     if (orient == wxHORIZONTAL)
     {
     int orient = event.GetOrientation();
     if (orient == wxHORIZONTAL)
     {

-        // Don't 'skip' or we'd get into infinite recursion
+        event.Skip();

         return;
     }
     if (!m_treeCtrl)
         return;
     }
     if (!m_treeCtrl)


@@ -585,8 +585,13 @@ void wxSplitterScrolledWindow::OnScroll(wxScrollWinEvent& event)
 
     if (orient == wxHORIZONTAL)
     {
 
     if (orient == wxHORIZONTAL)
     {

+        inOnScroll = FALSE;
+        event.Skip();
+        return;
+#if 0

         int newPos = m_xScrollPosition + nScrollInc;
         SetScrollPos(wxHORIZONTAL, newPos, TRUE );
         int newPos = m_xScrollPosition + nScrollInc;
         SetScrollPos(wxHORIZONTAL, newPos, TRUE );

+#endif

     }
     else
     {
     }
     else
     {