Cast needed to fix compilation on 10.4 --This line, and those below,

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

diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp
index 2e18569c112c615beff72db6bc2017f4f182c514..393231673c90d27c3ba5e556de050586668fd151 100644 (file)
--- a/src/generic/treectlg.cpp
+++ b/src/generic/treectlg.cpp
@@ -86,7 +86,7 @@ public:
 private:
     wxGenericTreeCtrl *m_owner;
 
 private:
     wxGenericTreeCtrl *m_owner;
 

-    DECLARE_NO_COPY_CLASS(wxTreeRenameTimer)
+    wxDECLARE_NO_COPY_CLASS(wxTreeRenameTimer);

 };
 
 // control used for in-place edit
 };
 
 // control used for in-place edit


@@ -114,7 +114,7 @@ private:
     bool                m_aboutToFinish;
 
     DECLARE_EVENT_TABLE()
     bool                m_aboutToFinish;
 
     DECLARE_EVENT_TABLE()

-    DECLARE_NO_COPY_CLASS(wxTreeTextCtrl)
+    wxDECLARE_NO_COPY_CLASS(wxTreeTextCtrl);

 };
 
 // timer used to clear wxGenericTreeCtrl::m_findPrefix if no key was pressed
 };
 
 // timer used to clear wxGenericTreeCtrl::m_findPrefix if no key was pressed


@@ -132,7 +132,7 @@ public:
 private:
     wxGenericTreeCtrl *m_owner;
 
 private:
     wxGenericTreeCtrl *m_owner;
 

-    DECLARE_NO_COPY_CLASS(wxTreeFindTimer)
+    wxDECLARE_NO_COPY_CLASS(wxTreeFindTimer);

 };
 
 // a tree item
 };
 
 // a tree item


@@ -355,7 +355,7 @@ private:
     unsigned int        m_isBold      :1; // render the label in bold font
     unsigned int        m_ownsAttr    :1; // delete attribute when done
 
     unsigned int        m_isBold      :1; // render the label in bold font
     unsigned int        m_ownsAttr    :1; // delete attribute when done
 

-    DECLARE_NO_COPY_CLASS(wxGenericTreeItem)
+    wxDECLARE_NO_COPY_CLASS(wxGenericTreeItem);

 };
 
 // =============================================================================
 };
 
 // =============================================================================


@@ -432,24 +432,24 @@ wxTreeTextCtrl::wxTreeTextCtrl(wxGenericTreeCtrl *owner,
     wxRect rect;
     m_owner->GetBoundingRect(m_itemEdited, rect, true);
 
     wxRect rect;
     m_owner->GetBoundingRect(m_itemEdited, rect, true);
 

-    // corrects possition and size for better apperance
+    // corrects position and size for better appearance

 #ifdef __WXMSW__
     rect.x -= 5;
     rect.width += 10;
 #ifdef __WXMSW__
     rect.x -= 5;
     rect.width += 10;

-#elif __WXGTK__
+#elif defined(__WXGTK__)

     rect.x -= 5;
     rect.y -= 2;
     rect.width  += 8;
     rect.height += 4;
     rect.x -= 5;
     rect.y -= 2;
     rect.width  += 8;
     rect.height += 4;

-#elif __WXMAC__
-    wxSize bs = DoGetBestSize();
-    // edit control height
-    if ( rect.height > bs.y - 8 )
-        int diff = rect.height - ( bs.y - 8 );
+#elif defined(__WXMAC__)
+    int bestHeight = GetBestSize().y - 8;
+    if ( rect.height > bestHeight )
+    {
+        int diff = rect.height - bestHeight;

         rect.height -= diff;
         rect.y += diff / 2;
         rect.height -= diff;
         rect.y += diff / 2;

-     }
-#endif
+    }
+#endif // platforms

 
     (void)Create(m_owner, wxID_ANY, m_startValue,
                  rect.GetPosition(), rect.GetSize());
 
     (void)Create(m_owner, wxID_ANY, m_startValue,
                  rect.GetPosition(), rect.GetSize());


@@ -966,7 +966,7 @@ void wxGenericTreeCtrl::Init()
     m_findTimer = NULL;
 
     m_dropEffectAboveItem = false;
     m_findTimer = NULL;
 
     m_dropEffectAboveItem = false;

-    
+

     m_dndEffect = NoEffect;
     m_dndEffectItem = NULL;
 
     m_dndEffect = NoEffect;
     m_dndEffectItem = NULL;
 


@@ -1775,6 +1775,16 @@ void wxGenericTreeCtrl::Delete(const wxTreeItemId& itemId)
     }
 
     wxGenericTreeItem *parent = item->GetParent();
     }
 
     wxGenericTreeItem *parent = item->GetParent();

+    
+    // if the selected item will be deleted, select the parent ...
+    wxGenericTreeItem *to_be_selected = parent;
+    if (parent)
+    {
+        // .. unless there is a next sibling like wxMSW does it
+        int pos = parent->GetChildren().Index( item );
+        if ((int)(parent->GetChildren().GetCount()) > pos+1)
+            to_be_selected = parent->GetChildren().Item( pos+1 );
+    }

 
     // don't keep stale pointers around!
     if ( IsDescendantOf(item, m_key_current) )
 
     // don't keep stale pointers around!
     if ( IsDescendantOf(item, m_key_current) )


@@ -1791,7 +1801,7 @@ void wxGenericTreeCtrl::Delete(const wxTreeItemId& itemId)
     // a different item, in idle time.
     if ( m_select_me && IsDescendantOf(item, m_select_me) )
     {
     // a different item, in idle time.
     if ( m_select_me && IsDescendantOf(item, m_select_me) )
     {

-        m_select_me = parent;
+        m_select_me = to_be_selected;

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


@@ -1802,7 +1812,7 @@ void wxGenericTreeCtrl::Delete(const wxTreeItemId& itemId)
 
         // m_current = parent;
         m_current = NULL;
 
         // m_current = parent;
         m_current = NULL;

-        m_select_me = parent;
+        m_select_me = to_be_selected;

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


@@ -2625,7 +2635,7 @@ void wxGenericTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
 
     // restore normal font
     dc.SetFont( m_normalFont );
 
     // restore normal font
     dc.SetFont( m_normalFont );

-    
+

     if (item == m_dndEffectItem)
     {
         dc.SetPen( *wxBLACK_PEN );
     if (item == m_dndEffectItem)
     {
         dc.SetPen( *wxBLACK_PEN );


@@ -2905,7 +2915,7 @@ void wxGenericTreeCtrl::DrawBorder(const wxTreeItemId &item)
         m_dndEffect = NoEffect;
         m_dndEffectItem = NULL;
     }
         m_dndEffect = NoEffect;
         m_dndEffectItem = NULL;
     }

-        
+

     wxRect rect( i->GetX()-1, i->GetY()-1, i->GetWidth()+2, GetLineHeight(i)+2 );
     CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
     RefreshRect( rect );
     wxRect rect( i->GetX()-1, i->GetY()-1, i->GetWidth()+2, GetLineHeight(i)+2 );
     CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
     RefreshRect( rect );


@@ -2930,7 +2940,7 @@ void wxGenericTreeCtrl::DrawLine(const wxTreeItemId &item, bool below)
         m_dndEffect = NoEffect;
         m_dndEffectItem = NULL;
     }
         m_dndEffect = NoEffect;
         m_dndEffectItem = NULL;
     }

-        
+

     wxRect rect( i->GetX()-1, i->GetY()-1, i->GetWidth()+2, GetLineHeight(i)+2 );
     CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
     RefreshRect( rect );
     wxRect rect( i->GetX()-1, i->GetY()-1, i->GetWidth()+2, GetLineHeight(i)+2 );
     CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
     RefreshRect( rect );


@@ -3576,6 +3586,8 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
 #if defined(__WXMSW__) || defined(__WXMAC__) || defined(__WXGTK20__)
             Update();
 #else
 #if defined(__WXMSW__) || defined(__WXMAC__) || defined(__WXGTK20__)
             Update();
 #else

+            // TODO: remove this call or use wxEventLoopBase::GetActive()->YieldFor(wxEVT_CATEGORY_UI)
+            //       instead (needs to be tested!)

             wxYieldIfNeeded();
 #endif
         }
             wxYieldIfNeeded();
 #endif
         }


@@ -3606,9 +3618,11 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
 
         SetCursor(m_oldCursor);
 
 
         SetCursor(m_oldCursor);
 

-#if defined( __WXMSW__ ) || defined(__WXMAC__)
+#if defined( __WXMSW__ ) || defined(__WXMAC__) || defined(__WXGTK20__)

         Update();
 #else
         Update();
 #else

+        // TODO: remove this call or use wxEventLoopBase::GetActive()->YieldFor(wxEVT_CATEGORY_UI)
+        //       instead (needs to be tested!)

         wxYieldIfNeeded();
 #endif
     }
         wxYieldIfNeeded();
 #endif
     }