Syntax fix.

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

diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp
index 5836734469c3298931ab8e12e0ba6b51b3a04431..89df6f6b1954038a6c6f6243cbcb9bb978c1ef38 100644 (file)
--- a/src/generic/treectlg.cpp
+++ b/src/generic/treectlg.cpp
@@ -758,6 +758,8 @@ void wxGenericTreeCtrl::Init()
 
     m_findTimer = NULL;
 
 
     m_findTimer = NULL;
 

+    m_dropEffectAboveItem = false;
+

     m_lastOnSame = false;
 
 #ifdef __WXMAC_CARBON__
     m_lastOnSame = false;
 
 #ifdef __WXMAC_CARBON__


@@ -2499,7 +2501,7 @@ void wxGenericTreeCtrl::DrawDropEffect(wxGenericTreeItem *item)
         {
             // draw a line under the drop target because the item will be
             // dropped there
         {
             // draw a line under the drop target because the item will be
             // dropped there

-            DrawLine(item, true /* below */);
+            DrawLine(item, !m_dropEffectAboveItem );

         }
 
         SetCursor(wxCURSOR_BULLSEYE);
         }
 
         SetCursor(wxCURSOR_BULLSEYE);


@@ -3102,7 +3104,7 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
             CaptureMouse();
         }
     }
             CaptureMouse();
         }
     }

-    else if ( event.Moving() )
+    else if ( event.Dragging() )

     {
         if ( item != m_dropTarget )
         {
     {
         if ( item != m_dropTarget )
         {


@@ -3114,7 +3116,7 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
             // highlight the current drop target if any
             DrawDropEffect(m_dropTarget);
 
             // highlight the current drop target if any
             DrawDropEffect(m_dropTarget);
 

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

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


@@ -3175,11 +3177,12 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
 
         if ( event.RightDown() )
         {
 
         if ( event.RightDown() )
         {

+            DoSelectItem(item, true, false);

             wxTreeEvent nevent(wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK, GetId());
             nevent.m_item = item;
             nevent.m_pointDrag = CalcScrolledPosition(pt);
             nevent.SetEventObject(this);
             wxTreeEvent nevent(wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK, GetId());
             nevent.m_item = item;
             nevent.m_pointDrag = CalcScrolledPosition(pt);
             nevent.SetEventObject(this);

-            GetEventHandler()->ProcessEvent(nevent);
+            event.Skip(!GetEventHandler()->ProcessEvent(nevent));

         }
         else if ( event.LeftUp() )
         {
         }
         else if ( event.LeftUp() )
         {


@@ -3561,6 +3564,20 @@ wxGenericTreeCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 #endif
 }
 
 #endif
 }
 

+#if WXWIN_COMPATIBILITY_2_4
+
+int wxGenericTreeCtrl::GetItemSelectedImage(const wxTreeItemId& item) const
+{
+    return GetItemImage(item, wxTreeItemIcon_Selected);
+}
+
+void wxGenericTreeCtrl::SetItemSelectedImage(const wxTreeItemId& item, int image)
+{
+    SetItemImage(item, image, wxTreeItemIcon_Selected);
+}
+
+#endif // WXWIN_COMPATIBILITY_2_4
+

 #if WXWIN_COMPATIBILITY_2_2
 
 wxTreeItemId wxGenericTreeCtrl::GetParent(const wxTreeItemId& item) const
 #if WXWIN_COMPATIBILITY_2_2
 
 wxTreeItemId wxGenericTreeCtrl::GetParent(const wxTreeItemId& item) const