digital mars updated

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

diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp
index e4d3c35fad07363eb081cee2a1b5a3dea562a6b8..f0be2d87232f673442e02b2739abd069a3031cb6 100644 (file)
--- a/src/generic/treectlg.cpp
+++ b/src/generic/treectlg.cpp
@@ -734,7 +734,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxGenericTreeCtrl)
 
 void wxGenericTreeCtrl::Init()
 {
 
 void wxGenericTreeCtrl::Init()
 {

-    m_current = m_key_current = m_anchor = (wxGenericTreeItem *) NULL;
+    m_current = m_key_current = m_anchor = m_select_me = (wxGenericTreeItem *) NULL;

     m_hasFocus = FALSE;
     m_dirty = FALSE;
 
     m_hasFocus = FALSE;
     m_dirty = FALSE;
 


@@ -1487,12 +1487,30 @@ void wxGenericTreeCtrl::Delete(const wxTreeItemId& itemId)
     // don't keep stale pointers around!
     if ( IsDescendantOf(item, m_key_current) )
     {
     // don't keep stale pointers around!
     if ( IsDescendantOf(item, m_key_current) )
     {

-        m_key_current = parent;
+        // Don't silently change the selection:
+        // do it properly in idle time, so event
+        // handlers get called.
+        
+        // m_key_current = parent;
+        m_key_current = NULL;
+    }
+
+    // m_select_me records whether we need to select
+    // a different item, in idle time.
+    if ( m_select_me && IsDescendantOf(item, m_select_me) )
+    {
+        m_select_me = parent;

     }
 
     if ( IsDescendantOf(item, m_current) )
     {
     }
 
     if ( IsDescendantOf(item, m_current) )
     {

-        m_current = parent;
+        // Don't silently change the selection:
+        // do it properly in idle time, so event
+        // handlers get called.
+        
+        // m_current = parent;
+        m_current = NULL;
+        m_select_me = parent;

     }
 
     // remove the item from the tree
     }
 
     // remove the item from the tree


@@ -1634,6 +1652,7 @@ void wxGenericTreeCtrl::Unselect()
         RefreshLine( m_current );
 
         m_current = NULL;
         RefreshLine( m_current );
 
         m_current = NULL;

+        m_select_me = NULL;

     }
 }
 
     }
 }
 


@@ -1719,6 +1738,7 @@ void wxGenericTreeCtrl::SelectItemRange(wxGenericTreeItem *item1, wxGenericTreeI
 {
     // item2 is not necessary after item1
     wxGenericTreeItem *first=NULL, *last=NULL;
 {
     // item2 is not necessary after item1
     wxGenericTreeItem *first=NULL, *last=NULL;

+    m_select_me = NULL;

 
     // choice first' and 'last' between item1 and item2
     if (item1->GetY()<item2->GetY())
 
     // choice first' and 'last' between item1 and item2
     if (item1->GetY()<item2->GetY())


@@ -1746,6 +1766,8 @@ void wxGenericTreeCtrl::SelectItem(const wxTreeItemId& itemId,
 {
     wxCHECK_RET( itemId.IsOk(), wxT("invalid tree item") );
 
 {
     wxCHECK_RET( itemId.IsOk(), wxT("invalid tree item") );
 

+    m_select_me = NULL;
+    

     bool is_single=!(GetWindowStyleFlag() & wxTR_MULTIPLE);
     wxGenericTreeItem *item = (wxGenericTreeItem*) itemId.m_pItem;
 
     bool is_single=!(GetWindowStyleFlag() & wxTR_MULTIPLE);
     wxGenericTreeItem *item = (wxGenericTreeItem*) itemId.m_pItem;
 


@@ -2326,7 +2348,8 @@ void wxGenericTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level
 
                 if (HasFlag(wxTR_AQUA_BUTTONS))
                 {
 
                 if (HasFlag(wxTR_AQUA_BUTTONS))
                 {

-#ifdef __WXMAC__
+                    // This causes update problems, so disabling for now.
+#if 0 // def __WXMAC__

                     wxMacPortSetter helper(&dc) ;
                     wxMacWindowClipper clipper(this) ;
                     wxDC::MacSetupBackgroundForCurrentPort( MacGetBackgroundBrush() ) ;
                     wxMacPortSetter helper(&dc) ;
                     wxMacWindowClipper clipper(this) ;
                     wxDC::MacSetupBackgroundForCurrentPort( MacGetBackgroundBrush() ) ;


@@ -3137,6 +3160,18 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
 
 void wxGenericTreeCtrl::OnIdle( wxIdleEvent &WXUNUSED(event) )
 {
 
 void wxGenericTreeCtrl::OnIdle( wxIdleEvent &WXUNUSED(event) )
 {

+    // Check if we need to select the root item
+    // because nothing else has been selected.
+    // Delaying it means that we can invoke event handlers
+    // as required, when a first item is selected.
+    if (!HasFlag(wxTR_MULTIPLE) && !GetSelection().IsOk())
+    {
+        if (m_select_me)
+            SelectItem(m_select_me);
+        else if (GetRootItem().IsOk())
+            SelectItem(GetRootItem());
+    }
+

     /* after all changes have been done to the tree control,
      * we actually redraw the tree when everything is over */
 
     /* after all changes have been done to the tree control,
      * we actually redraw the tree when everything is over */