Use the OOR typemap for wxTreeCtrls too.

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

diff --git a/contrib/src/gizmos/splittree.cpp b/contrib/src/gizmos/splittree.cpp
index ca4c7cf23f0d3c55bef80194f84dff1c18a5a110..346659cf3055d459fe9fdca759f619ce161a7890 100644 (file)
--- a/contrib/src/gizmos/splittree.cpp
+++ b/contrib/src/gizmos/splittree.cpp
@@ -265,7 +265,7 @@ void wxRemotelyScrolledTreeCtrl::OnPaint(wxPaintEvent& event)
     // Reset the device origin since it may have been set
     dc.SetDeviceOrigin(0, 0);
 
     // Reset the device origin since it may have been set
     dc.SetDeviceOrigin(0, 0);
 

-    wxPen pen(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DLIGHT), 1, wxSOLID);
+    wxPen pen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT), 1, wxSOLID);

     dc.SetPen(pen);
     dc.SetBrush(* wxTRANSPARENT_BRUSH);
 
     dc.SetPen(pen);
     dc.SetBrush(* wxTRANSPARENT_BRUSH);
 


@@ -282,7 +282,7 @@ void wxRemotelyScrolledTreeCtrl::OnPaint(wxPaintEvent& event)
             lastH = h;
         }
     }
             lastH = h;
         }
     }

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

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


@@ -473,10 +473,10 @@ void wxTreeCompanionWindow::OnPaint(wxPaintEvent& event)
     if (!m_treeCtrl)
         return;
 
     if (!m_treeCtrl)
         return;
 

-        wxPen pen(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DLIGHT), 1, wxSOLID);
+        wxPen pen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT), 1, wxSOLID);

     dc.SetPen(pen);
     dc.SetBrush(* wxTRANSPARENT_BRUSH);
     dc.SetPen(pen);
     dc.SetBrush(* wxTRANSPARENT_BRUSH);

-    wxFont font(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+    wxFont font(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));

     dc.SetFont(font);
 
     wxSize clientSize = GetClientSize();
     dc.SetFont(font);
 
     wxSize clientSize = GetClientSize();