Rework modal dialog code to not depend on now obsolete wxDIALOG_MODAL flag.

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

diff --git a/contrib/src/gizmos/splittree.cpp b/contrib/src/gizmos/splittree.cpp
index 87b3668ffdf6b002815013acb0914d030c2cc2ba..b1ac80d820ef11674a6b54840c97315424e6c471 100644 (file)
--- a/contrib/src/gizmos/splittree.cpp
+++ b/contrib/src/gizmos/splittree.cpp
@@ -236,7 +236,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


@@ -717,7 +717,7 @@ void wxSplitterScrolledWindow::OnScroll(wxScrollWinEvent& event)
     }
 
     // Find targets in splitter window and send the event to them
     }
 
     // Find targets in splitter window and send the event to them

-    wxWindowListNode* node = GetChildren().GetFirst();
+    wxWindowList::compatibility_iterator node = GetChildren().GetFirst();

     while (node)
     {
         wxWindow* child = (wxWindow*) node->GetData();
     while (node)
     {
         wxWindow* child = (wxWindow*) node->GetData();


@@ -733,9 +733,7 @@ void wxSplitterScrolledWindow::OnScroll(wxScrollWinEvent& event)
         node = node->GetNext();
     }
 
         node = node->GetNext();
     }
 

-#ifdef __WXMAC__
-    m_targetWindow->MacUpdateImmediately() ;
-#endif
+    m_targetWindow->Update() ;

 
     inOnScroll = FALSE;
 }
 
     inOnScroll = FALSE;
 }