tree control and dc::drawlines bug

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/event.h b/include/wx/event.h
index cd40b09c4c75985d9284378984d3542ed19fa15a..606a73749dd556dd4c380f02aee1eb5bd7776df3 100644 (file)
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -157,6 +157,8 @@ enum wxEventType {
  wxEVT_COMMAND_TREE_SET_INFO,
  wxEVT_COMMAND_TREE_ITEM_EXPANDED,
  wxEVT_COMMAND_TREE_ITEM_EXPANDING,
  wxEVT_COMMAND_TREE_SET_INFO,
  wxEVT_COMMAND_TREE_ITEM_EXPANDED,
  wxEVT_COMMAND_TREE_ITEM_EXPANDING,

+ wxEVT_COMMAND_TREE_ITEM_COLLAPSED,
+ wxEVT_COMMAND_TREE_ITEM_COLLAPSING,

  wxEVT_COMMAND_TREE_SEL_CHANGED,
  wxEVT_COMMAND_TREE_SEL_CHANGING,
  wxEVT_COMMAND_TREE_KEY_DOWN,
  wxEVT_COMMAND_TREE_SEL_CHANGED,
  wxEVT_COMMAND_TREE_SEL_CHANGING,
  wxEVT_COMMAND_TREE_KEY_DOWN,

diff --git a/include/wx/generic/treectrl.h b/include/wx/generic/treectrl.h
index e6e3df723e0be59616da04e8f1487589c9dbc30e..03cee90cff159dd1bc10b5eceaf7aaf88997ae12 100644 (file)
--- a/include/wx/generic/treectrl.h
+++ b/include/wx/generic/treectrl.h
@@ -194,6 +194,8 @@ typedef void (wxEvtHandler::*wxTreeEventFunction)(wxTreeEvent&);
 #define EVT_TREE_SET_INFO(id, fn) { wxEVT_COMMAND_TREE_SET_INFO, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
 #define EVT_TREE_ITEM_EXPANDED(id, fn) { wxEVT_COMMAND_TREE_ITEM_EXPANDED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
 #define EVT_TREE_ITEM_EXPANDING(id, fn) { wxEVT_COMMAND_TREE_ITEM_EXPANDING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
 #define EVT_TREE_SET_INFO(id, fn) { wxEVT_COMMAND_TREE_SET_INFO, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
 #define EVT_TREE_ITEM_EXPANDED(id, fn) { wxEVT_COMMAND_TREE_ITEM_EXPANDED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
 #define EVT_TREE_ITEM_EXPANDING(id, fn) { wxEVT_COMMAND_TREE_ITEM_EXPANDING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },

+#define EVT_TREE_ITEM_COLLAPSED(id, fn) { wxEVT_COMMAND_TREE_ITEM_COLLAPSED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
+#define EVT_TREE_ITEM_COLLAPSING(id, fn) { wxEVT_COMMAND_TREE_ITEM_COLLAPSING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },

 #define EVT_TREE_SEL_CHANGED(id, fn) { wxEVT_COMMAND_TREE_SEL_CHANGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
 #define EVT_TREE_SEL_CHANGING(id, fn) { wxEVT_COMMAND_TREE_SEL_CHANGING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
 #define EVT_TREE_KEY_DOWN(id, fn) { wxEVT_COMMAND_TREE_KEY_DOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
 #define EVT_TREE_SEL_CHANGED(id, fn) { wxEVT_COMMAND_TREE_SEL_CHANGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
 #define EVT_TREE_SEL_CHANGING(id, fn) { wxEVT_COMMAND_TREE_SEL_CHANGING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
 #define EVT_TREE_KEY_DOWN(id, fn) { wxEVT_COMMAND_TREE_KEY_DOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },


@@ -272,6 +274,7 @@ public:
   long InsertItem( long parent, wxTreeItem &info,
                    long insertAfter = wxTREE_INSERT_LAST );
   void DeleteItem( long item );
   long InsertItem( long parent, wxTreeItem &info,
                    long insertAfter = wxTREE_INSERT_LAST );
   void DeleteItem( long item );

+  void DeleteChildren( long item );

   bool DeleteAllItems();
   bool ExpandItem( long item, int action );
   bool GetItem( wxTreeItem &info ) const;
   bool DeleteAllItems();
   bool ExpandItem( long item, int action );
   bool GetItem( wxTreeItem &info ) const;

diff --git a/src/generic/treectrl.cpp b/src/generic/treectrl.cpp
index bbb5b9ade53b5b307283f267ba9fcfe918109a61..91f7733f4fbca5e78fd7a7aec3a3c3d8e94cf646 100644 (file)
--- a/src/generic/treectrl.cpp
+++ b/src/generic/treectrl.cpp
@@ -210,7 +210,7 @@ void wxGenericTreeItem::GetSize( int &x, int &y )
 
 long wxGenericTreeItem::HitTest( const wxPoint& point, int &flags )
 {
 
 long wxGenericTreeItem::HitTest( const wxPoint& point, int &flags )
 {

-  if (m_parent && ((point.y > m_y) && (point.y < m_y+m_height)))
+  if ((point.y > m_y) && (point.y < m_y+m_height))

   {
     if ((point.x > m_xCross-5) &&
         (point.x < m_xCross+5) &&
   {
     if ((point.x > m_xCross-5) &&
         (point.x < m_xCross+5) &&


@@ -292,7 +292,6 @@ void wxGenericTreeItem::SendExpand( wxWindow *target )
   m_isCollapsed = FALSE;
 
   wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_EXPANDING, target->GetId() );
   m_isCollapsed = FALSE;
 
   wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_EXPANDING, target->GetId() );

-  event.SetCode(wxTREE_EXPAND_EXPAND);

   event.SetEventObject( target );
   PrepareEvent( event );
   target->ProcessEvent( event );
   event.SetEventObject( target );
   PrepareEvent( event );
   target->ProcessEvent( event );


@@ -306,13 +305,12 @@ void wxGenericTreeItem::SendCollapse( wxWindow *target )
 {
   m_isCollapsed = TRUE;
 
 {
   m_isCollapsed = TRUE;
 

-  wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_EXPANDING, target->GetId() );
-  event.SetCode(wxTREE_EXPAND_COLLAPSE);
+  wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_COLLAPSING, target->GetId() );

   event.SetEventObject( target );
   PrepareEvent( event );
   target->ProcessEvent( event );
 
   event.SetEventObject( target );
   PrepareEvent( event );
   target->ProcessEvent( event );
 

-  event.SetEventType(wxEVT_COMMAND_TREE_ITEM_EXPANDED);
+  event.SetEventType(wxEVT_COMMAND_TREE_ITEM_COLLAPSED);

   PrepareEvent( event );
   target->ProcessEvent( event );
 };
   PrepareEvent( event );
   target->ProcessEvent( event );
 };


@@ -331,8 +329,7 @@ bool wxGenericTreeItem::HasHilight()
 // wxTreeCtrl
 //-----------------------------------------------------------------------------
 
 // wxTreeCtrl
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl,wxScrolledWindow
-)
+IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl,wxScrolledWindow)

 
 BEGIN_EVENT_TABLE(wxTreeCtrl,wxScrolledWindow)
   EVT_PAINT          (wxTreeCtrl::OnPaint)
 
 BEGIN_EVENT_TABLE(wxTreeCtrl,wxScrolledWindow)
   EVT_PAINT          (wxTreeCtrl::OnPaint)


@@ -358,8 +355,7 @@ wxTreeCtrl::wxTreeCtrl()
 };
 
 wxTreeCtrl::wxTreeCtrl(wxWindow *parent, wxWindowID id,
 };
 
 wxTreeCtrl::wxTreeCtrl(wxWindow *parent, wxWindowID id,

-            const wxPoint& pos,
- const wxSize& size,
+            const wxPoint& pos, const wxSize& size,

             long style, const wxString& name )
 {
   m_current = NULL;
             long style, const wxString& name )
 {
   m_current = NULL;


@@ -382,10 +378,8 @@ wxTreeCtrl::~wxTreeCtrl()
 };
 
 bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id,
 };
 
 bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id,

-            const wxPoint& pos,
- const wxSize& size,
-            long style
-, const wxString& name )
+            const wxPoint& pos, const wxSize& size,
+            long style, const wxString& name )

 {
   wxScrolledWindow::Create( parent, id, pos, size, style, name );
   SetBackgroundColour( *wxWHITE );
 {
   wxScrolledWindow::Create( parent, id, pos, size, style, name );
   SetBackgroundColour( *wxWHITE );


@@ -582,15 +576,9 @@ bool wxTreeCtrl::ExpandItem( long item, int action )
       while (node)
       {
         wxGenericTreeItem *child = (wxGenericTreeItem*)node->Data();
       while (node)
       {
         wxGenericTreeItem *child = (wxGenericTreeItem*)node->Data();

-#if 0 // VZ: don't delete items when the branch is collapsed
-        child->SendDelete( this );
-        delete node;
-        node = i->m_children.First();
-#else

         if ( child->IsExpanded() )
           ExpandItem( child->m_itemId, wxTREE_EXPAND_COLLAPSE );
         node = node->Next();
         if ( child->IsExpanded() )
           ExpandItem( child->m_itemId, wxTREE_EXPAND_COLLAPSE );
         node = node->Next();

-#endif

       };
 
       i->SendCollapse( this );
       };
 
       i->SendCollapse( this );


@@ -631,7 +619,19 @@ void wxTreeCtrl::DeleteItem( long item )
 {
   wxGenericTreeItem *pItem = FindItem( item );
   wxCHECK_RET( pItem != NULL, "wxTreeCtrl::DeleteItem: no such pItem." );
 {
   wxGenericTreeItem *pItem = FindItem( item );
   wxCHECK_RET( pItem != NULL, "wxTreeCtrl::DeleteItem: no such pItem." );

+  

   pItem->m_parent->m_children.DeleteObject(pItem);
   pItem->m_parent->m_children.DeleteObject(pItem);

+  
+  Refresh();
+}
+
+void wxTreeCtrl::DeleteChildren( long item )
+{
+  wxGenericTreeItem *pItem = FindItem( item );
+  wxCHECK_RET( pItem != NULL, "wxTreeCtrl::DeleteChildren: no such pItem." );
+  
+  pItem->m_children.Clear();
+  

   Refresh();
 }
 
   Refresh();
 }
 


@@ -777,87 +777,78 @@ void wxTreeCtrl::AdjustMyScrollbars()
 
 void wxTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxPaintDC &dc, int level, int &y )
 {
 
 void wxTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxPaintDC &dc, int level, int &y )
 {

-  int horizX = level*m_indent+10;
+  int horizX = level*m_indent;
+  
+  item->m_x = horizX+33;
+  item->m_y = y-m_lineHeight/3;
+  item->m_height = m_lineHeight;
+  
+  item->SetCross( horizX+15, y );
+

   int oldY = y;
   int oldY = y;

-  wxNode *node = item->m_children.First();
-  while (node)
+    
+  if (IsExposed( 0, item->m_y-2, 10000, m_lineHeight+4 ))

   {
   {

-    wxGenericTreeItem *child = (wxGenericTreeItem *)node->Data();
-    dc.SetPen( m_dottedPen );
-
-    child->SetCross( horizX+15, y );
-
-    if (!node->Next())
-    {
-      if (level != 0) oldY -= (m_lineHeight-5);
-      dc.DrawLine( horizX, oldY, horizX, y );
-    };
-
-    child->m_x = horizX+33;
-    child->m_y = y-m_lineHeight/3;
-    child->m_height = m_lineHeight;
+    int startX = horizX;
+    int endX = horizX + 10;

 
 

-    if (IsExposed( 0, child->m_y-2, 10000, m_lineHeight+4 ))
-    {
-      int startX = horizX,
-          endX = horizX + 10;
+    if (!item->HasChildren()) endX += 20;
+    dc.DrawLine( startX, y, endX, y ); 

 
 

-      if (!(node->Previous()) && (level == 0))
-        startX -= 10;
-      if (!child->HasChildren())
-        endX += 20;
-      dc.DrawLine( startX, y, endX, y );
-
-      if (child->HasChildren())
+      if (item->HasChildren())

       {
         dc.DrawLine( horizX+20, y, horizX+30, y );
         dc.SetPen( *wxGREY_PEN );
         dc.DrawRectangle( horizX+10, y-4, 11, 9 );
         dc.SetPen( *wxBLACK_PEN );
       {
         dc.DrawLine( horizX+20, y, horizX+30, y );
         dc.SetPen( *wxGREY_PEN );
         dc.DrawRectangle( horizX+10, y-4, 11, 9 );
         dc.SetPen( *wxBLACK_PEN );

-        dc.DrawLine( horizX+13, y, horizX+17, y );
-        if (child->HasPlus())
-          dc.DrawLine( horizX+15, y-2, horizX+15, y+2 );
+        dc.DrawLine( horizX+13, y, horizX+18, y );
+        if (item->HasPlus())
+          dc.DrawLine( horizX+15, y-2, horizX+15, y+3 );

       };
 
       };
 

-      if (child->HasHilight())
+      if (item->HasHilight())

       {
         dc.SetTextForeground( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_HIGHLIGHTTEXT ) );
       {
         dc.SetTextForeground( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_HIGHLIGHTTEXT ) );

-#if 0 // VZ: this code leaves horizontal stripes when item is unselected

         dc.SetBrush( *m_hilightBrush );
         if (m_hasFocus)
         dc.SetBrush( *m_hilightBrush );
         if (m_hasFocus)

-          dc.SetPen( wxBLACK_PEN );
+          dc.SetPen( *wxBLACK_PEN );

         else
         else

-          dc.SetPen( wxTRANSPARENT_PEN );
+          dc.SetPen( *wxWHITE_PEN );

         long tw, th;
         long tw, th;

-        dc.GetTextExtent( child->m_text, &tw, &th );
-        dc.DrawRectangle( child->m_x-2, child->m_y-2, tw+4, th+4 );
-#else
-        int modeOld = dc.GetBackgroundMode();
-        dc.SetTextBackground( *wxBLACK );
-        dc.SetBackgroundMode(wxSOLID);
-#endif // 0
-
-        dc.DrawText( child->m_text, child->m_x, child->m_y );
+        dc.GetTextExtent( item->m_text, &tw, &th );
+        dc.DrawRectangle( item->m_x-2, item->m_y-2, tw+4, th+4 );
+        dc.DrawText( item->m_text, item->m_x, item->m_y );

 
 

-#if 0 // VZ: same as above

         dc.SetPen( *wxBLACK_PEN );
         dc.SetPen( *wxBLACK_PEN );

-#else
-        dc.SetBackgroundMode(modeOld);
-        dc.SetTextBackground( *wxWHITE );
-        dc.SetBrush( *wxWHITE_BRUSH );
-#endif

         dc.SetTextForeground( *wxBLACK );
         dc.SetTextForeground( *wxBLACK );

+       dc.SetBrush( *wxWHITE_BRUSH );

       }
       else
       }
       else

-        dc.DrawText( child->m_text, child->m_x, child->m_y );
-    };
+      {
+        dc.SetPen( *wxWHITE_PEN );
+        long tw, th;
+        dc.GetTextExtent( item->m_text, &tw, &th );
+        dc.DrawRectangle( item->m_x-2, item->m_y-2, tw+4, th+4 );
+        dc.DrawText( item->m_text, item->m_x, item->m_y );
+        dc.SetPen( *wxBLACK_PEN );
+      };
+  };
+
+  if (item->NumberOfVisibleChildren() == 0) return;
+    
+  wxNode *node = item->m_children.First();
+  while (node)
+  {
+    wxGenericTreeItem *child = (wxGenericTreeItem *)node->Data();

 
     y += m_lineHeight;
 
     y += m_lineHeight;

-    if ( child->IsExpanded() && child->NumberOfVisibleChildren() > 0)
-      PaintLevel( child, dc, level+1, y );
+    PaintLevel( child, dc, level+1, y );
+      

     node = node->Next();
   };
     node = node->Next();
   };

-};
+
+  dc.DrawLine( horizX+15, oldY+5, horizX+15, y );
+}

 
 void wxTreeCtrl::OnPaint( const wxPaintEvent &WXUNUSED(event) )
 {
 
 void wxTreeCtrl::OnPaint( const wxPaintEvent &WXUNUSED(event) )
 {


@@ -940,28 +931,21 @@ void wxTreeCtrl::OnMouse( const wxMouseEvent &event )
 
 void wxTreeCtrl::CalculateLevel( wxGenericTreeItem *item, wxPaintDC &dc, int level, int &y )
 {
 
 void wxTreeCtrl::CalculateLevel( wxGenericTreeItem *item, wxPaintDC &dc, int level, int &y )
 {

-  int horizX = level*m_indent+10;
+  int horizX = level*m_indent;
+  
+  item->m_x = horizX+33;
+  item->m_y = y-m_lineHeight/3-2;
+  item->m_height = m_lineHeight;
+
+  if (item->NumberOfVisibleChildren() == 0) return;
+    

   wxNode *node = item->m_children.First();
   while (node)
   {
     wxGenericTreeItem *child = (wxGenericTreeItem *)node->Data();
   wxNode *node = item->m_children.First();
   while (node)
   {
     wxGenericTreeItem *child = (wxGenericTreeItem *)node->Data();

-    dc.SetPen( m_dottedPen );
-
-    int startX = horizX,
-        endX = horizX + 10;
-
-    if (!node->Previous() && (level == 0))
-      startX -= 10;
-    if (!child->HasChildren())
-      endX += 20;
-
-    child->m_x = horizX+33;
-    child->m_y = y-m_lineHeight/3-2;
-    child->m_height = m_lineHeight;
-
+    

     y += m_lineHeight;
     y += m_lineHeight;

-    if ( child->IsExpanded() && child->NumberOfVisibleChildren() > 0 )
-      CalculateLevel( child, dc, level+1, y );
+    CalculateLevel( child, dc, level+1, y );

 
     node = node->Next();
   };
 
     node = node->Next();
   };

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index dd64b45428519845e424b93ae5c451f6da025e91..ee102dc06a446b54107a1f38e0db1705ba22fde2 100644 (file)
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -241,7 +241,7 @@ void wxPaintDC::DrawLines( int n, wxPoint points[], long xoffset, long yoffset )
     long x2 = XLOG2DEV(points[i+1].x + xoffset);
     long y1 = YLOG2DEV(points[i].y + yoffset);     // oh, what a waste
     long y2 = YLOG2DEV(points[i+1].y + yoffset);
     long x2 = XLOG2DEV(points[i+1].x + xoffset);
     long y1 = YLOG2DEV(points[i].y + yoffset);     // oh, what a waste
     long y2 = YLOG2DEV(points[i+1].y + yoffset);

-    gdk_draw_line( m_window, m_brushGC, x1, y1, x2, y2 );
+    gdk_draw_line( m_window, m_penGC, x1, y1, x2, y2 );

   };
 };
 
   };
 };
 


@@ -260,7 +260,7 @@ void wxPaintDC::DrawLines( wxList *points, long xoffset, long yoffset )
     long x2 = XLOG2DEV(npoint->x + xoffset);
     long y1 = YLOG2DEV(point->y + yoffset);    // and again...
     long y2 = YLOG2DEV(npoint->y + yoffset);
     long x2 = XLOG2DEV(npoint->x + xoffset);
     long y1 = YLOG2DEV(point->y + yoffset);    // and again...
     long y2 = YLOG2DEV(npoint->y + yoffset);

-    gdk_draw_line( m_window, m_brushGC, x1, y1, x2, y2 );
+    gdk_draw_line( m_window, m_penGC, x1, y1, x2, y2 );

     node = node->Next();
   };
 };
     node = node->Next();
   };
 };

diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp
index dd64b45428519845e424b93ae5c451f6da025e91..ee102dc06a446b54107a1f38e0db1705ba22fde2 100644 (file)
--- a/src/gtk1/dcclient.cpp
+++ b/src/gtk1/dcclient.cpp
@@ -241,7 +241,7 @@ void wxPaintDC::DrawLines( int n, wxPoint points[], long xoffset, long yoffset )
     long x2 = XLOG2DEV(points[i+1].x + xoffset);
     long y1 = YLOG2DEV(points[i].y + yoffset);     // oh, what a waste
     long y2 = YLOG2DEV(points[i+1].y + yoffset);
     long x2 = XLOG2DEV(points[i+1].x + xoffset);
     long y1 = YLOG2DEV(points[i].y + yoffset);     // oh, what a waste
     long y2 = YLOG2DEV(points[i+1].y + yoffset);

-    gdk_draw_line( m_window, m_brushGC, x1, y1, x2, y2 );
+    gdk_draw_line( m_window, m_penGC, x1, y1, x2, y2 );

   };
 };
 
   };
 };
 


@@ -260,7 +260,7 @@ void wxPaintDC::DrawLines( wxList *points, long xoffset, long yoffset )
     long x2 = XLOG2DEV(npoint->x + xoffset);
     long y1 = YLOG2DEV(point->y + yoffset);    // and again...
     long y2 = YLOG2DEV(npoint->y + yoffset);
     long x2 = XLOG2DEV(npoint->x + xoffset);
     long y1 = YLOG2DEV(point->y + yoffset);    // and again...
     long y2 = YLOG2DEV(npoint->y + yoffset);

-    gdk_draw_line( m_window, m_brushGC, x1, y1, x2, y2 );
+    gdk_draw_line( m_window, m_penGC, x1, y1, x2, y2 );

     node = node->Next();
   };
 };
     node = node->Next();
   };
 };

diff --git a/user/wxFile/dirctrl.cpp b/user/wxFile/dirctrl.cpp
index 54cc5b683d2d64a8987b603afb6051e23b075efe..f4ee19aba7974b11d21d358567f5c412d735b4aa 100644 (file)
--- a/user/wxFile/dirctrl.cpp
+++ b/user/wxFile/dirctrl.cpp
@@ -73,6 +73,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxDirCtrl,wxTreeCtrl)
 
 BEGIN_EVENT_TABLE(wxDirCtrl,wxTreeCtrl)
   EVT_TREE_ITEM_EXPANDED      (-1, wxDirCtrl::OnExpandItem)
 
 BEGIN_EVENT_TABLE(wxDirCtrl,wxTreeCtrl)
   EVT_TREE_ITEM_EXPANDED      (-1, wxDirCtrl::OnExpandItem)

+  EVT_TREE_ITEM_COLLAPSED     (-1, wxDirCtrl::OnCollapseItem)

   EVT_TREE_DELETE_ITEM        (-1, wxDirCtrl::OnDeleteItem)
   EVT_MOUSE_EVENTS            (wxDirCtrl::OnMouse)
 END_EVENT_TABLE()
   EVT_TREE_DELETE_ITEM        (-1, wxDirCtrl::OnDeleteItem)
   EVT_MOUSE_EVENTS            (wxDirCtrl::OnMouse)
 END_EVENT_TABLE()


@@ -82,7 +83,7 @@ wxDirCtrl::wxDirCtrl(void)
   m_showHidden = FALSE;
 };
 
   m_showHidden = FALSE;
 };
 

-wxDirCtrl::wxDirCtrl(wxWindow *parent, const wxWindowID id, const wxString &dir,
+wxDirCtrl::wxDirCtrl(wxWindow *parent, const wxWindowID id, const wxString &WXUNUSED(dir),

             const wxPoint& pos, const wxSize& size,
             const long style, const wxString& name )
  :
             const wxPoint& pos, const wxSize& size,
             const long style, const wxString& name )
  :


@@ -92,56 +93,67 @@ wxDirCtrl::wxDirCtrl(wxWindow *parent, const wxWindowID id, const wxString &dir,
 
   wxTreeItem item;
   item.m_mask = wxTREE_MASK_TEXT | wxTREE_MASK_CHILDREN | wxTREE_MASK_DATA;
 
   wxTreeItem item;
   item.m_mask = wxTREE_MASK_TEXT | wxTREE_MASK_CHILDREN | wxTREE_MASK_DATA;

-  item.m_text = "root.";
+  item.m_text = "Sections";

   item.m_children = 1;
   item.m_children = 1;

+/*

   wxDirInfo *info = new wxDirInfo( dir );
   item.m_data = (long)info;
   wxDirInfo *info = new wxDirInfo( dir );
   item.m_data = (long)info;

+*/  
+  m_rootId = InsertItem( 0, item );
+};
+
+void wxDirCtrl::OnExpandItem( const wxTreeEvent &event )
+{
+  if (event.m_item.m_itemId == m_rootId)
+  {
+    
+    wxTreeItem item;
+    item.m_mask = wxTREE_MASK_TEXT | wxTREE_MASK_CHILDREN | wxTREE_MASK_DATA;
+    item.m_children = 1;
+    
+    wxDirInfo *info = new wxDirInfo( "/" );
+    item.m_text = info->GetName();
+    item.m_data = (long)info;
+    InsertItem( m_rootId, item );

   
   

-  long root_id = InsertItem( 0, item );
+    info = new wxDirInfo( "/home" );
+    item.m_text = info->GetName();
+    item.m_data = (long)info;
+    InsertItem( m_rootId, item );

   
   

-  info = new wxDirInfo( "/" );
-  item.m_text = info->GetName();
-  item.m_data = (long)info;
-  InsertItem( root_id, item );
+    info = new wxDirInfo( "/mnt" );
+    item.m_text = info->GetName();
+    item.m_data = (long)info;
+    InsertItem( m_rootId, item );

   
   

-  info = new wxDirInfo( "/home" );
-  item.m_text = info->GetName();
-  item.m_data = (long)info;
-  InsertItem( root_id, item );
+    info = new wxDirInfo( "/usr" );
+    item.m_text = info->GetName();
+    item.m_data = (long)info;
+    InsertItem( m_rootId, item );

   
   

-  info = new wxDirInfo( "/mnt" );
-  item.m_text = info->GetName();
-  item.m_data = (long)info;
-  InsertItem( root_id, item );
+    info = new wxDirInfo( "/usr/X11R6" );
+    item.m_text = info->GetName();
+    item.m_data = (long)info;
+    InsertItem( m_rootId, item );

   
   

-  info = new wxDirInfo( "/usr" );
-  item.m_text = info->GetName();
-  item.m_data = (long)info;
-  InsertItem( root_id, item );
+    info = new wxDirInfo( "/usr/local" );
+    item.m_text = info->GetName();
+    item.m_data = (long)info;
+    InsertItem( m_rootId, item );

   
   

-  info = new wxDirInfo( "/usr/X11R6" );
-  item.m_text = info->GetName();
-  item.m_data = (long)info;
-  InsertItem( root_id, item );
+    info = new wxDirInfo( "/var" );
+    item.m_text = info->GetName();
+    item.m_data = (long)info;
+    InsertItem( m_rootId, item );

   
   

-  info = new wxDirInfo( "/usr/local" );
-  item.m_text = info->GetName();
-  item.m_data = (long)info;
-  InsertItem( root_id, item );
-  
-  info = new wxDirInfo( "/var" );
-  item.m_text = info->GetName();
-  item.m_data = (long)info;
-  InsertItem( root_id, item );
-  
-  info = new wxDirInfo( "/proc" );
-  item.m_text = info->GetName();
-  item.m_data = (long)info;
-  InsertItem( root_id, item );
-};
+    info = new wxDirInfo( "/proc" );
+    item.m_text = info->GetName();
+    item.m_data = (long)info;
+    InsertItem( m_rootId, item );
+    
+    return;
+  };

 
 

-void wxDirCtrl::OnExpandItem( const wxTreeEvent &event )
-{

   wxDirInfo *info = (wxDirInfo *)event.m_item.m_data;
   if (!info) return;
   
   wxDirInfo *info = (wxDirInfo *)event.m_item.m_data;
   if (!info) return;
   


@@ -173,7 +185,7 @@ void wxDirCtrl::OnExpandItem( const wxTreeEvent &event )
     path = wxFindNextFile();
   };
 
     path = wxFindNextFile();
   };
 

-  for (int i = 0; i < slist.Count(); i++)
+  for (uint i = 0; i < slist.Count(); i++)

   {
     search = slist[i];
     search += "/*";
   {
     search = slist[i];
     search += "/*";


@@ -190,6 +202,11 @@ void wxDirCtrl::OnExpandItem( const wxTreeEvent &event )
   };
 };
 
   };
 };
 

+void wxDirCtrl::OnCollapseItem( const wxTreeEvent &event )
+{
+  DeleteChildren( event.m_item.m_itemId );
+};
+

 void wxDirCtrl::OnDeleteItem( const wxTreeEvent &event )
 {
   wxDirInfo *info = (wxDirInfo *)event.m_item.m_data;
 void wxDirCtrl::OnDeleteItem( const wxTreeEvent &event )
 {
   wxDirInfo *info = (wxDirInfo *)event.m_item.m_data;

diff --git a/user/wxFile/dirctrl.h b/user/wxFile/dirctrl.h
index 514944865c164b89fa67ed34e2be85f97508389e..d67cf82aa1033ea714af120a53ae3547c79fafdb 100644 (file)
--- a/user/wxFile/dirctrl.h
+++ b/user/wxFile/dirctrl.h
@@ -56,15 +56,16 @@ class wxDirCtrl: public wxTreeCtrl
 
     bool   m_showHidden;
     int    m_dragX,m_dragY;
 
     bool   m_showHidden;
     int    m_dragX,m_dragY;

+    long   m_rootId;

   
     wxDirCtrl(void);
     wxDirCtrl(wxWindow *parent, const wxWindowID id = -1, const wxString &dir = "/",
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             const long style = wxTR_HAS_BUTTONS,
   
     wxDirCtrl(void);
     wxDirCtrl(wxWindow *parent, const wxWindowID id = -1, const wxString &dir = "/",
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             const long style = wxTR_HAS_BUTTONS,

-            const wxString& name = "wxTreeCtrl" )
-;
+            const wxString& name = "wxTreeCtrl" );

     void OnExpandItem( const wxTreeEvent &event );
     void OnExpandItem( const wxTreeEvent &event );

+    void OnCollapseItem( const wxTreeEvent &event );

     void OnDeleteItem( const wxTreeEvent &event );
     void OnMouse( wxMouseEvent &event );
 
     void OnDeleteItem( const wxTreeEvent &event );
     void OnMouse( wxMouseEvent &event );
 

diff --git a/user/wxFile/wxFile.cpp b/user/wxFile/wxFile.cpp
index 33d19f26d3265fbf0710faa43c062caae1f035cc..d4030d71898f387f877fbc72fd36077141453e1e 100644 (file)
--- a/user/wxFile/wxFile.cpp
+++ b/user/wxFile/wxFile.cpp
@@ -361,13 +361,13 @@ void MyFrame::OnListDrag( wxListEvent &event )
 void MyFrame::OnTreeSelected( wxTreeEvent &event )
 {
   wxDirInfo *info = (wxDirInfo*) event.m_item.m_data;
 void MyFrame::OnTreeSelected( wxTreeEvent &event )
 {
   wxDirInfo *info = (wxDirInfo*) event.m_item.m_data;

-  SetStatusText( info->GetPath() );
+  if (info) SetStatusText( info->GetPath() );

 };
 
 void MyFrame::OnTreeKeyDown( wxTreeEvent &event )
 {
   wxDirInfo *info = (wxDirInfo*) event.m_item.m_data;
 };
 
 void MyFrame::OnTreeKeyDown( wxTreeEvent &event )
 {
   wxDirInfo *info = (wxDirInfo*) event.m_item.m_data;

-  m_rightFile->GoToDir( info->GetPath() );
+  if (info) m_rightFile->GoToDir( info->GetPath() );

 };
 
 //-----------------------------------------------------------------------------
 };
 
 //-----------------------------------------------------------------------------