Fixes to sizing and others, according to patch #1507207.

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

diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp
index fa66da1ac62bfca5ace5b41e6e6b61f92a0df88e..f968f6a9b80051263f4f34964b84b37e7599bd94 100644 (file)
--- a/src/generic/treectlg.cpp
+++ b/src/generic/treectlg.cpp
@@ -32,10 +32,11 @@
     #include "wx/dcclient.h"
     #include "wx/timer.h"
     #include "wx/settings.h"
     #include "wx/dcclient.h"
     #include "wx/timer.h"
     #include "wx/settings.h"

+    #include "wx/listbox.h"
+    #include "wx/textctrl.h"

 #endif
 
 #include "wx/generic/treectlg.h"
 #endif
 
 #include "wx/generic/treectlg.h"

-#include "wx/textctrl.h"

 #include "wx/imaglist.h"
 
 #include "wx/renderer.h"
 #include "wx/imaglist.h"
 
 #include "wx/renderer.h"


@@ -1492,9 +1493,7 @@ wxTreeItemId wxGenericTreeCtrl::DoInsertAfter(const wxTreeItemId& parentId,
 
 void wxGenericTreeCtrl::SendDeleteEvent(wxGenericTreeItem *item)
 {
 
 void wxGenericTreeCtrl::SendDeleteEvent(wxGenericTreeItem *item)
 {

-    wxTreeEvent event( wxEVT_COMMAND_TREE_DELETE_ITEM, GetId() );
-    event.m_item = item;
-    event.SetEventObject( this );
+    wxTreeEvent event(wxEVT_COMMAND_TREE_DELETE_ITEM, this, item);

     ProcessEvent( event );
 }
 
     ProcessEvent( event );
 }
 


@@ -1612,9 +1611,7 @@ void wxGenericTreeCtrl::Expand(const wxTreeItemId& itemId)
     if ( item->IsExpanded() )
         return;
 
     if ( item->IsExpanded() )
         return;
 

-    wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_EXPANDING, GetId() );
-    event.m_item = item;
-    event.SetEventObject( this );
+    wxTreeEvent event(wxEVT_COMMAND_TREE_ITEM_EXPANDING, this, item);

 
     if ( ProcessEvent( event ) && !event.IsAllowed() )
     {
 
     if ( ProcessEvent( event ) && !event.IsAllowed() )
     {


@@ -1660,9 +1657,7 @@ void wxGenericTreeCtrl::Collapse(const wxTreeItemId& itemId)
     if ( !item->IsExpanded() )
         return;
 
     if ( !item->IsExpanded() )
         return;
 

-    wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_COLLAPSING, GetId() );
-    event.m_item = item;
-    event.SetEventObject( this );
+    wxTreeEvent event(wxEVT_COMMAND_TREE_ITEM_COLLAPSING, this, item);

     if ( ProcessEvent( event ) && !event.IsAllowed() )
     {
         // cancelled by program
     if ( ProcessEvent( event ) && !event.IsAllowed() )
     {
         // cancelled by program


@@ -1842,10 +1837,8 @@ void wxGenericTreeCtrl::DoSelectItem(const wxTreeItemId& itemId,
             return;
     }
 
             return;
     }
 

-    wxTreeEvent event( wxEVT_COMMAND_TREE_SEL_CHANGING, GetId() );
-    event.m_item = item;
+    wxTreeEvent event(wxEVT_COMMAND_TREE_SEL_CHANGING, this, item);

     event.m_itemOld = m_current;
     event.m_itemOld = m_current;

-    event.SetEventObject( this );

     // TODO : Here we don't send any selection mode yet !
 
     if ( GetEventHandler()->ProcessEvent( event ) && !event.IsAllowed() )
     // TODO : Here we don't send any selection mode yet !
 
     if ( GetEventHandler()->ProcessEvent( event ) && !event.IsAllowed() )


@@ -2579,9 +2572,8 @@ void wxGenericTreeCtrl::OnKillFocus( wxFocusEvent &event )
 
 void wxGenericTreeCtrl::OnChar( wxKeyEvent &event )
 {
 
 void wxGenericTreeCtrl::OnChar( wxKeyEvent &event )
 {

-    wxTreeEvent te( wxEVT_COMMAND_TREE_KEY_DOWN, GetId() );
+    wxTreeEvent te( wxEVT_COMMAND_TREE_KEY_DOWN, this);

     te.m_evtKey = event;
     te.m_evtKey = event;

-    te.SetEventObject( this );

     if ( GetEventHandler()->ProcessEvent( te ) )
     {
         // intercepted by the user code
     if ( GetEventHandler()->ProcessEvent( te ) )
     {
         // intercepted by the user code


@@ -2647,22 +2639,19 @@ void wxGenericTreeCtrl::OnChar( wxKeyEvent &event )
                 wxRect ItemRect;
                 GetBoundingRect(m_current, ItemRect, true);
 
                 wxRect ItemRect;
                 GetBoundingRect(m_current, ItemRect, true);
 

-                wxTreeEvent eventMenu( wxEVT_COMMAND_TREE_ITEM_MENU, GetId() );
-                eventMenu.m_item = m_current;
+                wxTreeEvent eventMenu(wxEVT_COMMAND_TREE_ITEM_MENU, this, m_current);

                 // Use the left edge, vertical middle
                 eventMenu.m_pointDrag = wxPoint(ItemRect.GetX(),
                                                 ItemRect.GetY() + ItemRect.GetHeight() / 2);
                 // Use the left edge, vertical middle
                 eventMenu.m_pointDrag = wxPoint(ItemRect.GetX(),
                                                 ItemRect.GetY() + ItemRect.GetHeight() / 2);

-                eventMenu.SetEventObject( this );

                 GetEventHandler()->ProcessEvent( eventMenu );
                 GetEventHandler()->ProcessEvent( eventMenu );

-                break;

             }
             }

+            break;
+

         case ' ':
         case WXK_RETURN:
             if ( !event.HasModifiers() )
             {
         case ' ':
         case WXK_RETURN:
             if ( !event.HasModifiers() )
             {

-                wxTreeEvent eventAct( wxEVT_COMMAND_TREE_ITEM_ACTIVATED, GetId() );
-                eventAct.m_item = m_current;
-                eventAct.SetEventObject( this );
+                wxTreeEvent eventAct(wxEVT_COMMAND_TREE_ITEM_ACTIVATED, this, m_current);

                 GetEventHandler()->ProcessEvent( eventAct );
             }
 
                 GetEventHandler()->ProcessEvent( eventAct );
             }
 


@@ -2851,11 +2840,9 @@ void wxGenericTreeCtrl::OnChar( wxKeyEvent &event )
     }
 }
 
     }
 }
 

-wxTreeItemId wxGenericTreeCtrl::DoTreeHitTest(const wxPoint& point, int& flags)
+wxTreeItemId
+wxGenericTreeCtrl::DoTreeHitTest(const wxPoint& point, int& flags) const

 {
 {

-    // JACS: removed wxYieldIfNeeded() because it can cause the window
-    // to be deleted from under us if a close window event is pending
-

     int w, h;
     GetSize(&w, &h);
     flags=0;
     int w, h;
     GetSize(&w, &h);
     flags=0;


@@ -2924,9 +2911,7 @@ wxTextCtrl *wxGenericTreeCtrl::EditLabel(const wxTreeItemId& item,
 
     wxGenericTreeItem *itemEdit = (wxGenericTreeItem *)item.m_pItem;
 
 
     wxGenericTreeItem *itemEdit = (wxGenericTreeItem *)item.m_pItem;
 

-    wxTreeEvent te( wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, GetId() );
-    te.m_item = itemEdit;
-    te.SetEventObject( this );
+    wxTreeEvent te(wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, this, itemEdit);

     if ( GetEventHandler()->ProcessEvent( te ) && !te.IsAllowed() )
     {
         // vetoed by user
     if ( GetEventHandler()->ProcessEvent( te ) && !te.IsAllowed() )
     {
         // vetoed by user


@@ -2970,9 +2955,7 @@ void wxGenericTreeCtrl::EndEditLabel(const wxTreeItemId& WXUNUSED(item),
 bool wxGenericTreeCtrl::OnRenameAccept(wxGenericTreeItem *item,
                                        const wxString& value)
 {
 bool wxGenericTreeCtrl::OnRenameAccept(wxGenericTreeItem *item,
                                        const wxString& value)
 {

-    wxTreeEvent le( wxEVT_COMMAND_TREE_END_LABEL_EDIT, GetId() );
-    le.m_item = item;
-    le.SetEventObject( this );
+    wxTreeEvent le(wxEVT_COMMAND_TREE_END_LABEL_EDIT, this, item);

     le.m_label = value;
     le.m_editCancelled = false;
 
     le.m_label = value;
     le.m_editCancelled = false;
 


@@ -2982,9 +2965,7 @@ bool wxGenericTreeCtrl::OnRenameAccept(wxGenericTreeItem *item,
 void wxGenericTreeCtrl::OnRenameCancelled(wxGenericTreeItem *item)
 {
     // let owner know that the edit was cancelled
 void wxGenericTreeCtrl::OnRenameCancelled(wxGenericTreeItem *item)
 {
     // let owner know that the edit was cancelled

-    wxTreeEvent le( wxEVT_COMMAND_TREE_END_LABEL_EDIT, GetId() );
-    le.m_item = item;
-    le.SetEventObject( this );
+    wxTreeEvent le(wxEVT_COMMAND_TREE_END_LABEL_EDIT, this, item);

     le.m_label = wxEmptyString;
     le.m_editCancelled = true;
 
     le.m_label = wxEmptyString;
     le.m_editCancelled = true;
 


@@ -2998,7 +2979,7 @@ void wxGenericTreeCtrl::OnRenameTimer()
 
 void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
 {
 
 void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
 {

-    if ( !m_anchor ) return;
+    if ( !m_anchor )return;

 
     wxPoint pt = CalcUnscrolledPosition(event.GetPosition());
 
 
     wxPoint pt = CalcUnscrolledPosition(event.GetPosition());
 


@@ -3045,9 +3026,7 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
     if (underMouseChanged && hoverItem.IsOk() && !m_isDragging && (!m_renameTimer || !m_renameTimer->IsRunning()))
     {
         // Ask the tree control what tooltip (if any) should be shown
     if (underMouseChanged && hoverItem.IsOk() && !m_isDragging && (!m_renameTimer || !m_renameTimer->IsRunning()))
     {
         // Ask the tree control what tooltip (if any) should be shown

-        wxTreeEvent hevent(wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP, GetId());
-        hevent.m_item = hoverItem;
-        hevent.SetEventObject(this);
+        wxTreeEvent hevent(wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP,  this, hoverItem);

 
         if ( GetEventHandler()->ProcessEvent(hevent) && hevent.IsAllowed() )
         {
 
         if ( GetEventHandler()->ProcessEvent(hevent) && hevent.IsAllowed() )
         {


@@ -3092,9 +3071,7 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
                               ? wxEVT_COMMAND_TREE_BEGIN_RDRAG
                               : wxEVT_COMMAND_TREE_BEGIN_DRAG;
 
                               ? wxEVT_COMMAND_TREE_BEGIN_RDRAG
                               : wxEVT_COMMAND_TREE_BEGIN_DRAG;
 

-        wxTreeEvent nevent( command, GetId() );
-        nevent.m_item = m_current;
-        nevent.SetEventObject(this);
+        wxTreeEvent nevent(command,  this, m_current);

         nevent.SetPoint(CalcScrolledPosition(pt));
 
         // by default the dragging is not supported, the user code must
         nevent.SetPoint(CalcScrolledPosition(pt));
 
         // by default the dragging is not supported, the user code must


@@ -3159,11 +3136,9 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
         }
 
         // generate the drag end event
         }
 
         // generate the drag end event

-        wxTreeEvent eventEndDrag(wxEVT_COMMAND_TREE_END_DRAG, GetId());
+        wxTreeEvent eventEndDrag(wxEVT_COMMAND_TREE_END_DRAG,  this, item);

 
 

-        eventEndDrag.m_item = item;

         eventEndDrag.m_pointDrag = CalcScrolledPosition(pt);
         eventEndDrag.m_pointDrag = CalcScrolledPosition(pt);

-        eventEndDrag.SetEventObject(this);

 
         (void)GetEventHandler()->ProcessEvent(eventEndDrag);
 
 
         (void)GetEventHandler()->ProcessEvent(eventEndDrag);
 


@@ -3205,18 +3180,14 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
                 DoSelectItem(item, true, false);
             }
 
                 DoSelectItem(item, true, false);
             }
 

-            wxTreeEvent nevent(wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK, GetId());
-            nevent.m_item = item;
+            wxTreeEvent nevent(wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK,  this, item);

             nevent.m_pointDrag = CalcScrolledPosition(pt);
             nevent.m_pointDrag = CalcScrolledPosition(pt);

-            nevent.SetEventObject(this);

             event.Skip(!GetEventHandler()->ProcessEvent(nevent));
 
             // Consistent with MSW (for now), send the ITEM_MENU *after*
             // the RIGHT_CLICK event. TODO: This behavior may change.
             event.Skip(!GetEventHandler()->ProcessEvent(nevent));
 
             // Consistent with MSW (for now), send the ITEM_MENU *after*
             // the RIGHT_CLICK event. TODO: This behavior may change.

-            wxTreeEvent nevent2(wxEVT_COMMAND_TREE_ITEM_MENU, GetId());
-            nevent2.m_item = item;
+            wxTreeEvent nevent2(wxEVT_COMMAND_TREE_ITEM_MENU,  this, item);

             nevent2.m_pointDrag = CalcScrolledPosition(pt);
             nevent2.m_pointDrag = CalcScrolledPosition(pt);

-            nevent2.SetEventObject(this);

             GetEventHandler()->ProcessEvent(nevent2);
         }
         else if ( event.LeftUp() )
             GetEventHandler()->ProcessEvent(nevent2);
         }
         else if ( event.LeftUp() )


@@ -3308,10 +3279,8 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
                 m_lastOnSame = false;
 
                 // send activate event first
                 m_lastOnSame = false;
 
                 // send activate event first

-                wxTreeEvent nevent( wxEVT_COMMAND_TREE_ITEM_ACTIVATED, GetId() );
-                nevent.m_item = item;
+                wxTreeEvent nevent(wxEVT_COMMAND_TREE_ITEM_ACTIVATED,  this, item);

                 nevent.m_pointDrag = CalcScrolledPosition(pt);
                 nevent.m_pointDrag = CalcScrolledPosition(pt);

-                nevent.SetEventObject( this );

                 if ( !GetEventHandler()->ProcessEvent( nevent ) )
                 {
                     // if the user code didn't process the activate event,
                 if ( !GetEventHandler()->ProcessEvent( nevent ) )
                 {
                     // if the user code didn't process the activate event,


@@ -3566,10 +3535,6 @@ void wxGenericTreeCtrl::OnGetToolTip( wxTreeEvent &event )
 // be removed, as well as the #else case below.
 #define _USE_VISATTR 0
 
 // be removed, as well as the #else case below.
 #define _USE_VISATTR 0
 

-#if _USE_VISATTR
-#include "wx/listbox.h"
-#endif
-

 //static
 wxVisualAttributes
 #if _USE_VISATTR
 //static
 wxVisualAttributes
 #if _USE_VISATTR