interchanged w and h in wxSplitterWindow::OnSashPositionChange (now

[wxWidgets.git] / src / generic / treectrl.cpp

diff --git a/src/generic/treectrl.cpp b/src/generic/treectrl.cpp
index e6504c9bece29477f4245cd74ae4b167e3088b02..c7862e80998b8a76b8d0ae9bab30a8c640aa0443 100644 (file)
--- a/src/generic/treectrl.cpp
+++ b/src/generic/treectrl.cpp
@@ -381,6 +381,8 @@ wxTreeCtrl::wxTreeCtrl(wxWindow *parent, wxWindowID id,
 
 wxTreeCtrl::~wxTreeCtrl()
 {
+  if (m_hilightBrush) delete m_hilightBrush;
+  if (m_anchor) delete m_anchor;
 }
 
 bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id,
@@ -445,8 +447,8 @@ long wxTreeCtrl::InsertItem( long parent, const wxString& label, int image,
 
     if (!p->HasChildren()) p->m_hasChildren = TRUE;
 
-    int ch = 0;
-    GetClientSize( (int *) NULL, &ch );
+    int cw = 0, ch = 0;
+    GetClientSize( &cw, &ch );
 
     PrepareDC( dc );
     
@@ -932,7 +934,7 @@ void wxTreeCtrl::AdjustMyScrollbars()
   }
 }
 
-void wxTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxPaintDC &dc, int level, int &y )
+void wxTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level, int &y )
 {
   int horizX = level*m_indent;
 
@@ -1086,7 +1088,7 @@ void wxTreeCtrl::OnMouse( const wxMouseEvent &event )
   }
 }
 
-void wxTreeCtrl::CalculateLevel( wxGenericTreeItem *item, wxPaintDC &dc, int level, int &y )
+void wxTreeCtrl::CalculateLevel( wxGenericTreeItem *item, wxDC &dc, int level, int &y )
 {
   int horizX = level*m_indent;