Applied patch [ 919791 ] [widgets sample] Update wxListbox selection handling

[wxWidgets.git] / contrib / utils / wxrcedit / splittree.cpp

diff --git a/contrib/utils/wxrcedit/splittree.cpp b/contrib/utils/wxrcedit/splittree.cpp
index 263d9df88beb6ebc2faeafbda956df6bb1f8b27f..e5eedeec2cfe4e67e8d8aa1e3666a413873a09b7 100644 (file)
--- a/contrib/utils/wxrcedit/splittree.cpp
+++ b/contrib/utils/wxrcedit/splittree.cpp
@@ -209,7 +209,7 @@ void wxRemotelyScrolledTreeCtrl::ScrollToLine(int WXUNUSED(posHoriz), int posVer
     {
            UINT sbCode = SB_THUMBPOSITION;
            HWND vertScrollBar = 0;
     {
            UINT sbCode = SB_THUMBPOSITION;
            HWND vertScrollBar = 0;

-           MSWDefWindowProc((WXUINT) WM_VSCROLL, MAKELONG(sbCode, posVert), (WXHWND) vertScrollBar);
+           MSWDefWindowProc((WXUINT) WM_VSCROLL, MAKELONG(sbCode, posVert), (WXLPARAM) vertScrollBar);

     }
 #if USE_GENERIC_TREECTRL
     else
     }
 #if USE_GENERIC_TREECTRL
     else


@@ -444,13 +444,12 @@ void wxTreeCompanionWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
 
     wxSize clientSize = GetClientSize();
        wxRect itemRect;
 
     wxSize clientSize = GetClientSize();
        wxRect itemRect;

-       int cy=0;

        wxTreeItemId h, lastH;
        for(h=m_treeCtrl->GetFirstVisibleItem();h;h=m_treeCtrl->GetNextVisible(h))
        {
                if (m_treeCtrl->GetBoundingRect(h, itemRect))
                {
        wxTreeItemId h, lastH;
        for(h=m_treeCtrl->GetFirstVisibleItem();h;h=m_treeCtrl->GetNextVisible(h))
        {
                if (m_treeCtrl->GetBoundingRect(h, itemRect))
                {

-                       cy = itemRect.GetTop();
+                       int cy = itemRect.GetTop();

                        wxRect drawItemRect(0, cy, clientSize.x, itemRect.GetHeight());
 
                        lastH = h;
                        wxRect drawItemRect(0, cy, clientSize.x, itemRect.GetHeight());
 
                        lastH = h;


@@ -462,7 +461,7 @@ void wxTreeCompanionWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
        }
        if (lastH.IsOk() && m_treeCtrl->GetBoundingRect(lastH, itemRect))
        {
        }
        if (lastH.IsOk() && m_treeCtrl->GetBoundingRect(lastH, itemRect))
        {

-               cy = itemRect.GetBottom();
+               int cy = itemRect.GetBottom();

                dc.DrawLine(0, cy, clientSize.x, cy);
        }
 }
                dc.DrawLine(0, cy, clientSize.x, cy);
        }
 }