don't draw borders for bitmap buttons with wxBORDER_NONE style

[wxWidgets.git] / include / wx / generic / treectlg.h

diff --git a/include/wx/generic/treectlg.h b/include/wx/generic/treectlg.h
index 356e48de4832cb2fc9ad93ff08ac1b91919cefa0..71dea9fc13a3c7bab2639f1e12046d853ddb1e49 100644 (file)
--- a/include/wx/generic/treectlg.h
+++ b/include/wx/generic/treectlg.h
@@ -257,7 +257,12 @@ protected:
     wxCursor             m_oldCursor;  // cursor is changed while dragging
     wxGenericTreeItem   *m_oldSelection;
     wxGenericTreeItem   *m_underMouse; // for visual effects
+    
+    enum { NoEffect, BorderEffect, AboveEffect, BelowEffect } m_dndEffect;
+    wxGenericTreeItem   *m_dndEffectItem; 
+    
     wxTreeTextCtrl      *m_textCtrl;
+    
 
     wxTimer             *m_renameTimer;
 
@@ -315,7 +320,6 @@ protected:
 
     void CalculateLevel( wxGenericTreeItem *item, wxDC &dc, int level, int &y );
     void CalculatePositions();
-    void CalculateSize( wxGenericTreeItem *item, wxDC &dc );
 
     void RefreshSubtree( wxGenericTreeItem *item );
     void RefreshLine( wxGenericTreeItem *item );
@@ -344,7 +348,7 @@ protected:
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxGenericTreeCtrl)
-    DECLARE_NO_COPY_CLASS(wxGenericTreeCtrl)
+    wxDECLARE_NO_COPY_CLASS(wxGenericTreeCtrl);
 };
 
 #if !defined(__WXMSW__) || defined(__WXUNIVERSAL__)