added test for HitTest(m_dragPoint) bug to the sample

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

diff --git a/contrib/utils/wxrcedit/splittree.cpp b/contrib/utils/wxrcedit/splittree.cpp
index c5499bb059eac6790791c952dc042ac4fec9a366..b2796bd6ee67dda8f1c62850fee39c958c3cae73 100644 (file)
--- a/contrib/utils/wxrcedit/splittree.cpp
+++ b/contrib/utils/wxrcedit/splittree.cpp
@@ -37,6 +37,11 @@
 
 #include "wx/generic/treectlg.h"
 
 
 #include "wx/generic/treectlg.h"
 

+#ifdef __WXMSW__
+#include "windows.h"
+#include "wx/msw/winundef.h"
+#endif
+

 #include "splittree.h"
 
 /*
 #include "splittree.h"
 
 /*


@@ -170,7 +175,7 @@ void wxRemotelyScrolledTreeCtrl::PrepareDC(wxDC& dc)
         scrolledWindow->GetScrollPixelsPerUnit(& xppu2, & yppu2);
 
         dc.SetDeviceOrigin( -startX * xppu1, -startY * yppu2 );
         scrolledWindow->GetScrollPixelsPerUnit(& xppu2, & yppu2);
 
         dc.SetDeviceOrigin( -startX * xppu1, -startY * yppu2 );

-        dc.SetUserScale( win->GetScaleX(), win->GetScaleY() );
+        //dc.SetUserScale( win->GetScaleX(), win->GetScaleY() );

     }
 }
 
     }
 }
 


@@ -403,7 +408,7 @@ void wxTreeCompanionWindow::OnPaint(wxPaintEvent& event)
     if (!m_treeCtrl)
         return;
 
     if (!m_treeCtrl)
         return;
 

-        wxPen pen(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DLIGHT), 1, wxSOLID);
+        wxPen pen(wxColour(_T("BLACK")), 1, wxSOLID);

        dc.SetPen(pen);
        dc.SetBrush(* wxTRANSPARENT_BRUSH);
        wxFont font(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
        dc.SetPen(pen);
        dc.SetBrush(* wxTRANSPARENT_BRUSH);
        wxFont font(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));


@@ -576,7 +581,7 @@ void wxSplitterScrolledWindow::OnScroll(wxScrollWinEvent& event)
 
     int orient = event.GetOrientation();
 
 
     int orient = event.GetOrientation();
 

-    int nScrollInc = CalcScrollInc(event);
+    int nScrollInc = 16;// FIXME CalcScrollInc(event);

     if (nScrollInc == 0)
     {
         inOnScroll = FALSE;
     if (nScrollInc == 0)
     {
         inOnScroll = FALSE;