Disable any refresh in backing window (set_back_pixmap( None ..) makes it transparent

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

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 3ca5d64b8708f53de0c6d234f83621b911181145..d7b2598ad18dc01b9121219c2f4e6c9010f78231 100644 (file)
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -2,7 +2,7 @@
 // Name:        src/generic/datavgen.cpp
 // Purpose:     wxDataViewCtrl generic implementation
 // Author:      Robert Roebling
 // Name:        src/generic/datavgen.cpp
 // Purpose:     wxDataViewCtrl generic implementation
 // Author:      Robert Roebling

-// Modified by: Francesco Montorsi, Guru Kathiresan, Otto Wyss
+// Modified by: Francesco Montorsi, Guru Kathiresan, Bo Yang

 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence


@@ -42,6 +42,8 @@
 #include "wx/renderer.h"
 #include "wx/dcbuffer.h"
 #include "wx/icon.h"
 #include "wx/renderer.h"
 #include "wx/dcbuffer.h"
 #include "wx/icon.h"

+#include "wx/list.h"
+#include "wx/listimpl.cpp"

 
 //-----------------------------------------------------------------------------
 // classes
 
 //-----------------------------------------------------------------------------
 // classes


@@ -54,9 +56,6 @@ static const int SCROLL_UNIT_X = 15;
 // the cell padding on the left/right
 static const int PADDING_RIGHTLEFT = 3;
 
 // the cell padding on the left/right
 static const int PADDING_RIGHTLEFT = 3;
 

-// the cell padding on the top/bottom
-static const int PADDING_TOPBOTTOM = 1;
-

 // the expander space margin
 static const int EXPANDER_MARGIN = 4;
 
 // the expander space margin
 static const int EXPANDER_MARGIN = 4;
 


@@ -66,6 +65,12 @@ static const int EXPANDER_MARGIN = 4;
 
 #define USE_NATIVE_HEADER_WINDOW    1
 
 
 #define USE_NATIVE_HEADER_WINDOW    1
 

+//Below is the compare stuff
+//For the generic implements, both the leaf nodes and the nodes are sorted for fast search when needed
+static wxDataViewModel * g_model;
+static int g_column = -2;
+static bool g_asending = true;
+

 // NB: for some reason, this class must be dllexport'ed or we get warnings from
 //     MSVC in DLL build
 class WXDLLIMPEXP_ADV wxDataViewHeaderWindowBase : public wxControl
 // NB: for some reason, this class must be dllexport'ed or we get warnings from
 //     MSVC in DLL build
 class WXDLLIMPEXP_ADV wxDataViewHeaderWindowBase : public wxControl


@@ -133,17 +138,23 @@ public:
     // the column count
     virtual void UpdateDisplay();
 
     // the column count
     virtual void UpdateDisplay();
 

-    // called when the main window gets scrolled
+    // called Refresh afterwards

     virtual void ScrollWindow(int dx, int dy, const wxRect *rect = NULL);
 
 protected:
     virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
     virtual void ScrollWindow(int dx, int dy, const wxRect *rect = NULL);
 
 protected:
     virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);

+    

     virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags);
 
     virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags);
 

+    wxSize DoGetBestSize() const;
+

     unsigned int GetColumnIdxFromHeader(NMHEADER *nmHDR);
 
     wxDataViewColumn *GetColumnFromHeader(NMHEADER *nmHDR)
         { return GetColumn(GetColumnIdxFromHeader(nmHDR)); }
     unsigned int GetColumnIdxFromHeader(NMHEADER *nmHDR);
 
     wxDataViewColumn *GetColumnFromHeader(NMHEADER *nmHDR)
         { return GetColumn(GetColumnIdxFromHeader(nmHDR)); }

+        
+    int m_scrollOffsetX;
+    int m_buttonHeight;

 
 private:
     DECLARE_DYNAMIC_CLASS(wxDataViewHeaderWindowMSW)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxDataViewHeaderWindowMSW)


@@ -179,7 +190,7 @@ public:
     }
 
     virtual void UpdateDisplay() { Refresh(); }
     }
 
     virtual void UpdateDisplay() { Refresh(); }

-    
+

     // event handlers:
 
     void OnPaint( wxPaintEvent &event );
     // event handlers:
 
     void OnPaint( wxPaintEvent &event );


@@ -196,6 +207,7 @@ protected:
     bool                 m_isDragging;
 
     bool                 m_dirty;     // needs refresh?
     bool                 m_isDragging;
 
     bool                 m_dirty;     // needs refresh?

+    int                  m_hover;     // index of the column under the mouse

     int                  m_column;    // index of the column being resized
     int                  m_currentX;  // divider line position in logical (unscrolled) coords
     int                  m_minX;      // minimal position beyond which the divider line
     int                  m_column;    // index of the column being resized
     int                  m_currentX;  // divider line position in logical (unscrolled) coords
     int                  m_minX;      // minimal position beyond which the divider line


@@ -216,6 +228,7 @@ protected:
         m_isDragging = false;
         m_dirty = false;
 
         m_isDragging = false;
         m_dirty = false;
 

+        m_hover = wxNOT_FOUND;

         m_column = wxNOT_FOUND;
         m_currentX = 0;
         m_minX = 0;
         m_column = wxNOT_FOUND;
         m_currentX = 0;
         m_minX = 0;


@@ -224,7 +237,6 @@ protected:
         m_penCurrent = wxPen(col, 1, wxSOLID);
     }
 
         m_penCurrent = wxPen(col, 1, wxSOLID);
     }
 

-    void DrawCurrent();

     void AdjustDC(wxDC& dc);
 
 private:
     void AdjustDC(wxDC& dc);
 
 private:


@@ -251,67 +263,149 @@ public:
 //-----------------------------------------------------------------------------
 // wxDataViewTreeNode
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxDataViewTreeNode
 //-----------------------------------------------------------------------------

-class wxDataViewTreeNode; 
-WX_DEFINE_ARRAY_PTR( wxDataViewTreeNode *, wxDataViewTreeNodes );
+class wxDataViewTreeNode;
+WX_DEFINE_ARRAY( wxDataViewTreeNode *, wxDataViewTreeNodes );
+WX_DEFINE_ARRAY( void* , wxDataViewTreeLeaves);
+
+int LINKAGEMODE wxGenericTreeModelNodeCmp( wxDataViewTreeNode ** node1, wxDataViewTreeNode ** node2);
+int LINKAGEMODE wxGenericTreeModelItemCmp( void ** id1, void ** id2);

 
 class wxDataViewTreeNode
 {
 public:
 
 class wxDataViewTreeNode
 {
 public:

-    wxDataViewTreeNode( wxDataViewTreeNode * parent )
-       { this->parent = parent; 
-          if( parent == NULL )
-              open = true;
-          else
-               open = false;
-          hasChildren = false;
-       }
-    //I don't know what I need to do in the destructure
+    wxDataViewTreeNode( wxDataViewTreeNode * parent = NULL )
+    {
+        m_parent = parent;
+        if (!parent)
+            m_open = true;
+        else
+            m_open = false;
+        m_hasChildren = false;
+        m_subTreeCount  = 0;
+    }
+

     ~wxDataViewTreeNode()
     ~wxDataViewTreeNode()

-       { }
+    {
+    }

 
 

-    wxDataViewTreeNode * GetParent() { return parent; }
-    void SetParent( wxDataViewTreeNode * parent ) { this->parent = parent; }
-    wxDataViewTreeNodes &  GetChildren() { return children; }
-    void SetChildren( wxDataViewTreeNodes  children ) { this->children = children; }
+    wxDataViewTreeNode * GetParent() { return m_parent; }
+    void SetParent( wxDataViewTreeNode * parent ) { m_parent = parent; }
+    wxDataViewTreeNodes &  GetNodes() { return m_nodes; }
+    wxDataViewTreeLeaves & GetChildren() { return m_leaves; }

 
 

-    wxDataViewTreeNode * GetChild( unsigned int n ) { return children.Item( n ); }
-    void InsertChild( wxDataViewTreeNode * child, unsigned int n) { children.Insert( child, n); }
-    void AppendChild( wxDataViewTreeNode * child ) { children.Add( child ); }
+    void AddNode( wxDataViewTreeNode * node )
+    {
+        m_leaves.Add( node->GetItem().GetID() );
+        if (g_column >= -1)
+            m_leaves.Sort( &wxGenericTreeModelItemCmp );
+        m_nodes.Add( node );
+        if (g_column >= -1)
+            m_nodes.Sort( &wxGenericTreeModelNodeCmp );
+    }
+    void AddLeaf( void * leaf )
+    {
+        m_leaves.Add( leaf );
+        if (g_column >= -1)
+            m_leaves.Sort( &wxGenericTreeModelItemCmp );
+    }

 
 

-    wxDataViewItem & GetItem() { return item; }
-    void SetItem( wxDataViewItem & item ) { this->item = item; }
+    wxDataViewItem & GetItem() { return m_item; }
+    void SetItem( const wxDataViewItem & item ) { m_item = item; }

 
 

-    unsigned int GetChildrenNumber() { return children.GetCount(); }
+    unsigned int GetChildrenNumber() { return m_leaves.GetCount(); }
+    unsigned int GetNodeNumber() { return m_nodes.GetCount(); }

     int GetIndentLevel()
     {
         int ret = 0 ;
     int GetIndentLevel()
     {
         int ret = 0 ;

-        wxDataViewTreeNode * node = this;
-        while( node->GetParent()->GetParent() != NULL )
-        {
-            node = node->GetParent();
-            ret ++;
-        }
-        return ret;
-    }
-
-    bool IsOpen() { return open; } 
-    void ToggleOpen(){ open = !open; }
-    bool HasChildren() { return hasChildren; }
-    void SetHasChildren( bool has ){ hasChildren = has; }
+        wxDataViewTreeNode * node = this;
+        while( node->GetParent()->GetParent() != NULL )
+        {
+            node = node->GetParent();
+            ret ++;
+        }
+        return ret;
+    }
+
+    bool IsOpen()
+    {
+        return m_open ;
+    }
+
+    void ToggleOpen()
+    {
+        int len = m_nodes.GetCount();
+        int sum = 0;
+        for ( int i = 0 ;i < len ; i ++)
+            sum += m_nodes[i]->GetSubTreeCount();
+
+        sum += m_leaves.GetCount();
+        if (m_open)
+        {
+            ChangeSubTreeCount(-sum);
+            m_open = !m_open;
+        }
+        else
+        {
+            m_open = !m_open;
+            ChangeSubTreeCount(sum);
+        }
+    }
+    bool HasChildren() { return m_hasChildren; }
+    void SetHasChildren( bool has ){ m_hasChildren = has; }
+
+    void SetSubTreeCount( int num ) { m_subTreeCount = num; }
+    int GetSubTreeCount() { return m_subTreeCount; }
+    void ChangeSubTreeCount( int num )
+    {
+        if( !m_open )
+            return ;
+        m_subTreeCount += num;
+        if( m_parent )
+            m_parent->ChangeSubTreeCount(num);
+    }
+
+    void Resort()
+    {
+        if (g_column >= -1)
+        {
+            m_nodes.Sort( &wxGenericTreeModelNodeCmp );
+            int len = m_nodes.GetCount();
+            for (int i = 0; i < len; i ++)
+                m_nodes[i]->Resort();
+            m_leaves.Sort( &wxGenericTreeModelItemCmp );
+        }
+    }
+

 private:
 private:

-    wxDataViewTreeNode * parent;
-    wxDataViewTreeNodes  children; 
-    wxDataViewItem  item; 
-    bool open;
-    bool hasChildren;
+    wxDataViewTreeNode  *m_parent;
+    wxDataViewTreeNodes  m_nodes;
+    wxDataViewTreeLeaves m_leaves;
+    wxDataViewItem       m_item;
+    bool                 m_open;
+    bool                 m_hasChildren;
+    int                  m_subTreeCount;

 };
 
 };
 

+int LINKAGEMODE wxGenericTreeModelNodeCmp( wxDataViewTreeNode ** node1, wxDataViewTreeNode ** node2)
+{
+    return g_model->Compare( (*node1)->GetItem(), (*node2)->GetItem(), g_column, g_asending );
+}
+
+int LINKAGEMODE wxGenericTreeModelItemCmp( void ** id1, void ** id2)
+{
+    return g_model->Compare( *id1, *id2, g_column, g_asending );
+}
+
+
+

 //-----------------------------------------------------------------------------
 // wxDataViewMainWindow
 //-----------------------------------------------------------------------------
 
 WX_DEFINE_SORTED_USER_EXPORTED_ARRAY_SIZE_T(unsigned int, wxDataViewSelection,
                                             WXDLLIMPEXP_ADV);
 //-----------------------------------------------------------------------------
 // wxDataViewMainWindow
 //-----------------------------------------------------------------------------
 
 WX_DEFINE_SORTED_USER_EXPORTED_ARRAY_SIZE_T(unsigned int, wxDataViewSelection,
                                             WXDLLIMPEXP_ADV);

+WX_DECLARE_LIST(wxDataViewItem, ItemList);
+WX_DEFINE_LIST(ItemList)

 
 class wxDataViewMainWindow: public wxWindow
 {
 
 class wxDataViewMainWindow: public wxWindow
 {


@@ -325,10 +419,37 @@ public:
 
     // notifications from wxDataViewModel
     bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item );
 
     // notifications from wxDataViewModel
     bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item );

-    bool ItemDeleted( const wxDataViewItem &item );
+    bool ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item );

     bool ItemChanged( const wxDataViewItem &item );
     bool ValueChanged( const wxDataViewItem &item, unsigned int col );
     bool Cleared();
     bool ItemChanged( const wxDataViewItem &item );
     bool ValueChanged( const wxDataViewItem &item, unsigned int col );
     bool Cleared();

+    void Resort()
+    {
+        if (m_root)
+        {
+            SortPrepare();
+            m_root->Resort();
+        }
+        UpdateDisplay();
+    }
+
+    void SortPrepare()
+    {
+        g_model = GetOwner()->GetModel();
+        wxDataViewColumn* col = GetOwner()->GetSortingColumn();
+        if( !col )
+        {
+            if (g_model->HasDefaultCompare())
+                g_column = -1;
+            else
+                g_column = -2;
+
+            g_asending = true;
+            return;
+        }
+        g_column = col->GetModelColumn();
+        g_asending = col->IsSortOrderAscending();
+    }

 
     void SetOwner( wxDataViewCtrl* owner ) { m_owner = owner; }
     wxDataViewCtrl *GetOwner() { return m_owner; }
 
     void SetOwner( wxDataViewCtrl* owner ) { m_owner = owner; }
     wxDataViewCtrl *GetOwner() { return m_owner; }


@@ -348,6 +469,7 @@ public:
     void OnRenameTimer();
 
     void ScrollWindow( int dx, int dy, const wxRect *rect = NULL );
     void OnRenameTimer();
 
     void ScrollWindow( int dx, int dy, const wxRect *rect = NULL );

+    void ScrollTo( int rows, int column );

 
     bool HasCurrentRow() { return m_currentRow != (unsigned int)-1; }
     void ChangeCurrentRow( unsigned int row );
 
     bool HasCurrentRow() { return m_currentRow != (unsigned int)-1; }
     void ChangeCurrentRow( unsigned int row );


@@ -362,14 +484,16 @@ public:
     unsigned int GetLastVisibleRow();
     unsigned int GetRowCount() ;
 
     unsigned int GetLastVisibleRow();
     unsigned int GetRowCount() ;
 

-    wxDataViewItem GetSelection();
-
+    wxDataViewItem GetSelection() const;
+    wxDataViewSelection GetSelections(){ return m_selection; }
+    void SetSelections( const wxDataViewSelection & sel ) { m_selection = sel; UpdateDisplay(); }

     void Select( const wxArrayInt& aSelections );
     void SelectAllRows( bool on );
     void SelectRow( unsigned int row, bool on );
     void SelectRows( unsigned int from, unsigned int to, bool on );
     void ReverseRowSelection( unsigned int row );
     bool IsRowSelected( unsigned int row );
     void Select( const wxArrayInt& aSelections );
     void SelectAllRows( bool on );
     void SelectRow( unsigned int row, bool on );
     void SelectRows( unsigned int from, unsigned int to, bool on );
     void ReverseRowSelection( unsigned int row );
     bool IsRowSelected( unsigned int row );

+    void SendSelectionChangedEvent( const wxDataViewItem& item);

 
     void RefreshRow( unsigned int row );
     void RefreshRows( unsigned int from, unsigned int to );
 
     void RefreshRow( unsigned int row );
     void RefreshRows( unsigned int from, unsigned int to );


@@ -381,16 +505,20 @@ public:
         return wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT);
     }
 
         return wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT);
     }
 

-    //void EnsureVisible( unsigned int row );

     wxRect GetLineRect( unsigned int row ) const;
 
     //Some useful functions for row and item mapping
     wxRect GetLineRect( unsigned int row ) const;
 
     //Some useful functions for row and item mapping

-    wxDataViewItem GetItemByRow( unsigned int row );
-    unsigned int GetRowByItem( const wxDataViewItem & item );
+    wxDataViewItem GetItemByRow( unsigned int row ) const;
+    int GetRowByItem( const wxDataViewItem & item );

 
     //Methods for building the mapping tree
     void BuildTree( wxDataViewModel  * model );
     void DestroyTree();
 
     //Methods for building the mapping tree
     void BuildTree( wxDataViewModel  * model );
     void DestroyTree();

+    void HitTest( const wxPoint & point, wxDataViewItem & item, wxDataViewColumn* &column );
+    wxRect GetItemRect( const wxDataViewItem & item, const wxDataViewColumn* column );
+
+    void Expand( unsigned int row ) { OnExpanding( row ); }
+    void Collapse( unsigned int row ) { OnCollapsing( row ); }

 private:
     wxDataViewTreeNode * GetTreeNodeByRow( unsigned int row );
     //We did not need this temporarily
 private:
     wxDataViewTreeNode * GetTreeNodeByRow( unsigned int row );
     //We did not need this temporarily


@@ -398,9 +526,12 @@ private:
 
     int RecalculateCount() ;
 
 
     int RecalculateCount() ;
 

+    wxDataViewEvent SendExpanderEvent( wxEventType type, const wxDataViewItem & item );

     void OnExpanding( unsigned int row );
     void OnCollapsing( unsigned int row );
 
     void OnExpanding( unsigned int row );
     void OnCollapsing( unsigned int row );
 

+    wxDataViewTreeNode * FindNode( const wxDataViewItem & item );
+

 private:
     wxDataViewCtrl             *m_owner;
     int                         m_lineHeight;
 private:
     wxDataViewCtrl             *m_owner;
     int                         m_lineHeight;


@@ -430,8 +561,10 @@ private:
     wxPen m_penExpander;
 
     //This is the tree structure of the model
     wxPen m_penExpander;
 
     //This is the tree structure of the model

-    wxDataViewTreeNode * m_root; 
+    wxDataViewTreeNode * m_root;

     int m_count;
     int m_count;

+    //This is the tree node under the cursor
+    wxDataViewTreeNode * m_underMouse;

 private:
     DECLARE_DYNAMIC_CLASS(wxDataViewMainWindow)
     DECLARE_EVENT_TABLE()
 private:
     DECLARE_DYNAMIC_CLASS(wxDataViewMainWindow)
     DECLARE_EVENT_TABLE()


@@ -449,14 +582,16 @@ public:
 
     virtual bool ItemAdded( const wxDataViewItem & parent, const wxDataViewItem & item )
         { return m_mainWindow->ItemAdded( parent , item ); }
 
     virtual bool ItemAdded( const wxDataViewItem & parent, const wxDataViewItem & item )
         { return m_mainWindow->ItemAdded( parent , item ); }

-    virtual bool ItemDeleted( const wxDataViewItem & item )
-        { return m_mainWindow->ItemDeleted( item ); }
+    virtual bool ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item )
+        { return m_mainWindow->ItemDeleted( parent, item ); }

     virtual bool ItemChanged( const wxDataViewItem & item )
         { return m_mainWindow->ItemChanged(item);  }
     virtual bool ValueChanged( const wxDataViewItem & item , unsigned int col )
         { return m_mainWindow->ValueChanged( item, col ); }
     virtual bool Cleared()
         { return m_mainWindow->Cleared(); }
     virtual bool ItemChanged( const wxDataViewItem & item )
         { return m_mainWindow->ItemChanged(item);  }
     virtual bool ValueChanged( const wxDataViewItem & item , unsigned int col )
         { return m_mainWindow->ValueChanged( item, col ); }
     virtual bool Cleared()
         { return m_mainWindow->Cleared(); }

+    virtual void Resort()
+         { m_mainWindow->Resort(); }

 
     wxDataViewMainWindow    *m_mainWindow;
 };
 
     wxDataViewMainWindow    *m_mainWindow;
 };


@@ -475,6 +610,8 @@ wxDataViewRenderer::wxDataViewRenderer( const wxString &varianttype,
     m_dc = NULL;
     m_align = align;
     m_mode = mode;
     m_dc = NULL;
     m_align = align;
     m_mode = mode;

+    m_wantsAttr = false;
+    m_hasAttr = false;

 }
 
 wxDataViewRenderer::~wxDataViewRenderer()
 }
 
 wxDataViewRenderer::~wxDataViewRenderer()


@@ -509,6 +646,16 @@ wxDataViewCustomRenderer::wxDataViewCustomRenderer( const wxString &varianttype,
 {
 }
 
 {
 }
 

+void wxDataViewCustomRenderer::RenderText( const wxString &text, int xoffset, wxRect cell, wxDC *dc, int state )
+{
+    wxDataViewCtrl *view = GetOwner()->GetOwner();
+    wxColour col = (state & wxDATAVIEW_CELL_SELECTED) ?
+                        wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT) :
+                        view->GetForegroundColour();
+    dc->SetTextForeground(col);
+    dc->DrawText( text, cell.x + xoffset, cell.y + ((cell.height - dc->GetCharHeight()) / 2));
+}
+

 // ---------------------------------------------------------
 // wxDataViewTextRenderer
 // ---------------------------------------------------------
 // ---------------------------------------------------------
 // wxDataViewTextRenderer
 // ---------------------------------------------------------


@@ -534,14 +681,14 @@ bool wxDataViewTextRenderer::GetValue( wxVariant& WXUNUSED(value) ) const
 }
 
 bool wxDataViewTextRenderer::HasEditorCtrl()
 }
 
 bool wxDataViewTextRenderer::HasEditorCtrl()

-{ 
+{

     return true;
 }
 
 wxControl* wxDataViewTextRenderer::CreateEditorCtrl( wxWindow *parent,
         wxRect labelRect, const wxVariant &value )
 {
     return true;
 }
 
 wxControl* wxDataViewTextRenderer::CreateEditorCtrl( wxWindow *parent,
         wxRect labelRect, const wxVariant &value )
 {

-    return new wxTextCtrl( parent, wxID_ANY, value, 
+    return new wxTextCtrl( parent, wxID_ANY, value,

                            wxPoint(labelRect.x,labelRect.y),
                            wxSize(labelRect.width,labelRect.height) );
 }
                            wxPoint(labelRect.x,labelRect.y),
                            wxSize(labelRect.width,labelRect.height) );
 }


@@ -555,14 +702,7 @@ bool wxDataViewTextRenderer::GetValueFromEditorCtrl( wxControl *editor, wxVarian
 
 bool wxDataViewTextRenderer::Render( wxRect cell, wxDC *dc, int state )
 {
 
 bool wxDataViewTextRenderer::Render( wxRect cell, wxDC *dc, int state )
 {

-    wxDataViewCtrl *view = GetOwner()->GetOwner();
-    wxColour col = (state & wxDATAVIEW_CELL_SELECTED) ?
-                        wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT) :
-                        view->GetForegroundColour();
-
-    dc->SetTextForeground(col);
-    dc->DrawText( m_text, cell.x, cell.y );
-
+    RenderText( m_text, 0, cell, dc, state );

     return true;
 }
 
     return true;
 }
 


@@ -578,6 +718,60 @@ wxSize wxDataViewTextRenderer::GetSize() const
     return wxSize(80,20);
 }
 
     return wxSize(80,20);
 }
 

+// ---------------------------------------------------------
+// wxDataViewTextRendererAttr
+// ---------------------------------------------------------
+
+IMPLEMENT_CLASS(wxDataViewTextRendererAttr, wxDataViewTextRenderer)
+
+wxDataViewTextRendererAttr::wxDataViewTextRendererAttr( const wxString &varianttype,
+                            wxDataViewCellMode mode, int align ) :
+    wxDataViewTextRenderer( varianttype, mode, align )
+{
+    m_wantsAttr = true;
+}
+
+bool wxDataViewTextRendererAttr::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) )
+{
+    wxFont font;
+    wxColour colour;
+
+    if (m_hasAttr)
+    {
+        if (m_attr.HasColour())
+        {
+            colour = dc->GetTextForeground();
+            dc->SetTextForeground( m_attr.GetColour() );
+        }
+        
+        if (m_attr.GetBold() || m_attr.GetItalic())
+        {
+             font = dc->GetFont();
+             wxFont myfont = font;
+             if (m_attr.GetBold())
+                 myfont.SetWeight( wxFONTWEIGHT_BOLD );
+             if (m_attr.GetItalic())
+                 myfont.SetStyle( wxFONTSTYLE_ITALIC );
+             dc->SetFont( myfont );
+        }
+    }
+    
+    dc->DrawText( m_text, cell.x, cell.y + ((cell.height - dc->GetCharHeight()) / 2));
+    
+    // restore dc
+    if (m_hasAttr)
+    {
+        if (m_attr.HasColour())
+            dc->SetTextForeground( colour );
+            
+        if (m_attr.GetBold() || m_attr.GetItalic())
+            dc->SetFont( font );
+    }
+    
+    return true;
+}
+        
+

 // ---------------------------------------------------------
 // wxDataViewBitmapRenderer
 // ---------------------------------------------------------
 // ---------------------------------------------------------
 // wxDataViewBitmapRenderer
 // ---------------------------------------------------------


@@ -823,12 +1017,10 @@ bool wxDataViewDateRenderer::GetValue( wxVariant &value ) const
     return true;
 }
 
     return true;
 }
 

-bool wxDataViewDateRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) )
+bool wxDataViewDateRenderer::Render( wxRect cell, wxDC *dc, int state )

 {
 {

-    dc->SetFont( GetOwner()->GetOwner()->GetFont() );

     wxString tmp = m_date.FormatDate();
     wxString tmp = m_date.FormatDate();

-    dc->DrawText( tmp, cell.x, cell.y );
-
+    RenderText( tmp, 0, cell, dc, state );

     return true;
 }
 
     return true;
 }
 


@@ -861,6 +1053,80 @@ bool wxDataViewDateRenderer::Activate( wxRect WXUNUSED(cell), wxDataViewModel *m
     return true;
 }
 
     return true;
 }
 

+// ---------------------------------------------------------
+// wxDataViewIconTextRenderer
+// ---------------------------------------------------------
+
+IMPLEMENT_CLASS(wxDataViewIconTextRenderer, wxDataViewCustomRenderer)
+
+wxDataViewIconTextRenderer::wxDataViewIconTextRenderer(
+  const wxString &varianttype, wxDataViewCellMode mode, int align ) :
+    wxDataViewCustomRenderer( varianttype, mode, align )
+{
+    SetMode(mode);
+    SetAlignment(align);
+}
+
+wxDataViewIconTextRenderer::~wxDataViewIconTextRenderer()
+{
+}
+
+bool wxDataViewIconTextRenderer::SetValue( const wxVariant &value )
+{
+    m_value << value;
+    return true;
+}
+
+bool wxDataViewIconTextRenderer::GetValue( wxVariant& WXUNUSED(value) ) const
+{
+    return false;
+}
+
+bool wxDataViewIconTextRenderer::Render( wxRect cell, wxDC *dc, int state )
+{
+    int xoffset = 0;
+    const wxIcon &icon = m_value.GetIcon();
+    if (icon.IsOk())
+    {
+        dc->DrawIcon( icon, cell.x, cell.y + ((cell.height - icon.GetHeight()) / 2));
+        xoffset =  icon.GetWidth()+4;
+    }
+
+    RenderText( m_value.GetText(), xoffset, cell, dc, state );
+
+    return true;
+}
+
+wxSize wxDataViewIconTextRenderer::GetSize() const
+{
+    const wxDataViewCtrl *view = GetView();
+    if (!m_value.GetText().empty())
+    {
+        int x,y;
+        view->GetTextExtent( m_value.GetText(), &x, &y );
+
+        if (m_value.GetIcon().IsOk())
+            x += m_value.GetIcon().GetWidth() + 4;
+        return wxSize( x, y );
+    }
+    return wxSize(80,20);
+}
+
+wxControl *
+wxDataViewIconTextRenderer::CreateEditorCtrl(wxWindow * WXUNUSED(parent),
+                                             wxRect WXUNUSED(labelRect),
+                                             const wxVariant& WXUNUSED(value))
+{
+    return NULL;
+}
+
+bool
+wxDataViewIconTextRenderer::GetValueFromEditorCtrl(wxControl* WXUNUSED(editor),
+                                                   wxVariant& WXUNUSED(value))
+{
+    return false;
+}
+

 // ---------------------------------------------------------
 // wxDataViewColumn
 // ---------------------------------------------------------
 // ---------------------------------------------------------
 // wxDataViewColumn
 // ---------------------------------------------------------


@@ -927,7 +1193,7 @@ void wxDataViewColumn::SetSortable( bool sortable )
         m_flags |= wxDATAVIEW_COL_SORTABLE;
     else
         m_flags &= ~wxDATAVIEW_COL_SORTABLE;
         m_flags |= wxDATAVIEW_COL_SORTABLE;
     else
         m_flags &= ~wxDATAVIEW_COL_SORTABLE;

-        
+

     // Update header button
     if (GetOwner())
         GetOwner()->OnColumnChange();
     // Update header button
     if (GetOwner())
         GetOwner()->OnColumnChange();


@@ -936,7 +1202,7 @@ void wxDataViewColumn::SetSortable( bool sortable )
 void wxDataViewColumn::SetSortOrder( bool ascending )
 {
     m_ascending = ascending;
 void wxDataViewColumn::SetSortOrder( bool ascending )
 {
     m_ascending = ascending;

-    
+

     // Update header button
     if (GetOwner())
         GetOwner()->OnColumnChange();
     // Update header button
     if (GetOwner())
         GetOwner()->OnColumnChange();


@@ -958,7 +1224,7 @@ void wxDataViewColumn::SetInternalWidth( int width )
 
 void wxDataViewColumn::SetWidth( int width )
 {
 
 void wxDataViewColumn::SetWidth( int width )
 {

-    m_owner->m_headerArea->UpdateDisplay();
+    if (m_owner->m_headerArea) m_owner->m_headerArea->UpdateDisplay();

 
     SetInternalWidth(width);
 }
 
     SetInternalWidth(width);
 }


@@ -986,6 +1252,13 @@ void wxDataViewHeaderWindowBase::SendEvent(wxEventType type, unsigned int n)
 
 #if defined(__WXMSW__) && USE_NATIVE_HEADER_WINDOW
 
 
 #if defined(__WXMSW__) && USE_NATIVE_HEADER_WINDOW
 

+#ifndef HDS_DRAGDROP
+    #define HDS_DRAGDROP 0x0040
+#endif
+#ifndef HDS_FULLDRAG
+    #define HDS_FULLDRAG 0x0080
+#endif
+

 // implemented in msw/listctrl.cpp:
 int WXDLLIMPEXP_CORE wxMSWGetColumnClicked(NMHDR *nmhdr, POINT *ptClick);
 
 // implemented in msw/listctrl.cpp:
 int WXDLLIMPEXP_CORE wxMSWGetColumnClicked(NMHDR *nmhdr, POINT *ptClick);
 


@@ -997,17 +1270,24 @@ bool wxDataViewHeaderWindowMSW::Create( wxDataViewCtrl *parent, wxWindowID id,
 {
     m_owner = parent;
 
 {
     m_owner = parent;
 

-    if ( !CreateControl(parent, id, pos, size, 0, wxDefaultValidator, name) )
-        return false;
+    m_scrollOffsetX = 0;
+    m_buttonHeight = wxRendererNative::Get().GetHeaderButtonHeight( this ) + 10;

 
     int x = pos.x == wxDefaultCoord ? 0 : pos.x,
         y = pos.y == wxDefaultCoord ? 0 : pos.y,
         w = size.x == wxDefaultCoord ? 1 : size.x,
 
     int x = pos.x == wxDefaultCoord ? 0 : pos.x,
         y = pos.y == wxDefaultCoord ? 0 : pos.y,
         w = size.x == wxDefaultCoord ? 1 : size.x,

-        h = size.y == wxDefaultCoord ? 22 : size.y;
+        h = size.y == wxDefaultCoord ? m_buttonHeight : size.y;
+
+    if ( !CreateControl(parent, id, pos, size, 0, wxDefaultValidator, name) )
+        return false;

 
     // create the native WC_HEADER window:
     WXHWND hwndParent = (HWND)parent->GetHandle();
 
     // create the native WC_HEADER window:
     WXHWND hwndParent = (HWND)parent->GetHandle();

-    WXDWORD msStyle = WS_CHILD | HDS_BUTTONS | HDS_HORZ | HDS_HOTTRACK | HDS_FULLDRAG;
+    WXDWORD msStyle = WS_CHILD | HDS_DRAGDROP | HDS_BUTTONS | HDS_HORZ | HDS_HOTTRACK | HDS_FULLDRAG;
+    
+    if ( m_isShown )
+        msStyle |= WS_VISIBLE;
+    

     m_hWnd = CreateWindowEx(0,
                             WC_HEADER,
                             (LPCTSTR) NULL,
     m_hWnd = CreateWindowEx(0,
                             WC_HEADER,
                             (LPCTSTR) NULL,


@@ -1030,37 +1310,7 @@ bool wxDataViewHeaderWindowMSW::Create( wxDataViewCtrl *parent, wxWindowID id,
     // the following is required to get the default win's font for
     // header windows and must be done befor sending the HDM_LAYOUT msg
     SetFont(GetFont());
     // the following is required to get the default win's font for
     // header windows and must be done befor sending the HDM_LAYOUT msg
     SetFont(GetFont());

-
-    RECT rcParent;
-    HDLAYOUT hdl;
-    WINDOWPOS wp;
-
-    // Retrieve the bounding rectangle of the parent window's
-    // client area, and then request size and position values
-    // from the header control.
-    ::GetClientRect((HWND)hwndParent, &rcParent);
-
-    hdl.prc = &rcParent;
-    hdl.pwpos = &wp;
-    if (!SendMessage((HWND)m_hWnd, HDM_LAYOUT, 0, (LPARAM) &hdl))
-    {
-        wxLogLastError(_T("SendMessage"));
-        return false;
-    }
-
-    // Set the size, position, and visibility of the header control.
-    SetWindowPos((HWND)m_hWnd,
-                 wp.hwndInsertAfter,
-                 wp.x, wp.y,
-                 wp.cx, wp.cy,
-                 wp.flags | SWP_SHOWWINDOW);
-
-    // set our size hints: wxDataViewCtrl will put this wxWindow inside
-    // a wxBoxSizer and in order to avoid super-big header windows,
-    // we need to set our height as fixed
-    SetMinSize(wxSize(-1, wp.cy));
-    SetMaxSize(wxSize(-1, wp.cy));
-
+    

     return true;
 }
 
     return true;
 }
 


@@ -1069,6 +1319,11 @@ wxDataViewHeaderWindowMSW::~wxDataViewHeaderWindow()
     UnsubclassWin();
 }
 
     UnsubclassWin();
 }
 

+wxSize wxDataViewHeaderWindowMSW::DoGetBestSize() const
+{
+    return wxSize(80, m_buttonHeight );
+}
+

 void wxDataViewHeaderWindowMSW::UpdateDisplay()
 {
     // remove old columns
 void wxDataViewHeaderWindowMSW::UpdateDisplay()
 {
     // remove old columns


@@ -1090,6 +1345,15 @@ void wxDataViewHeaderWindowMSW::UpdateDisplay()
         hdi.cxy = col->GetWidth();
         hdi.cchTextMax = sizeof(hdi.pszText)/sizeof(hdi.pszText[0]);
         hdi.fmt = HDF_LEFT | HDF_STRING;
         hdi.cxy = col->GetWidth();
         hdi.cchTextMax = sizeof(hdi.pszText)/sizeof(hdi.pszText[0]);
         hdi.fmt = HDF_LEFT | HDF_STRING;

+        //hdi.fmt &= ~(HDF_SORTDOWN|HDF_SORTUP);
+
+        if (col->IsSortable() && GetOwner()->GetSortingColumn() == col)
+        {
+            //The Microsoft Comctrl32.dll 6.0 support SORTUP/SORTDOWN, but they are not default
+            //see http://msdn2.microsoft.com/en-us/library/ms649534.aspx for more detail
+            // VZ: works with 5.81
+            hdi.fmt |= col->IsSortOrderAscending() ? HDF_SORTUP : HDF_SORTDOWN;
+        }

 
         // lParam is reserved for application's use:
         // we store there the column index to use it later in MSWOnNotify
 
         // lParam is reserved for application's use:
         // we store there the column index to use it later in MSWOnNotify


@@ -1118,7 +1382,7 @@ void wxDataViewHeaderWindowMSW::UpdateDisplay()
 
         default:
             // such alignment is not allowed for the column header!
 
         default:
             // such alignment is not allowed for the column header!

-            wxFAIL;
+            break; // wxFAIL;

         }
 
         SendMessage((HWND)m_hWnd, HDM_INSERTITEM,
         }
 
         SendMessage((HWND)m_hWnd, HDM_INSERTITEM,


@@ -1211,6 +1475,28 @@ bool wxDataViewHeaderWindowMSW::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARA
         case HDN_ITEMCLICK:
             {
                 unsigned int idx = GetColumnIdxFromHeader(nmHDR);
         case HDN_ITEMCLICK:
             {
                 unsigned int idx = GetColumnIdxFromHeader(nmHDR);

+                wxDataViewModel * model = GetOwner()->GetModel();
+
+                if(nmHDR->iButton == 0)
+                {
+                    wxDataViewColumn *col = GetColumn(idx);
+                    if(col->IsSortable())
+                    {
+                        if(model && m_owner->GetSortingColumn() == col)
+                        {
+                            bool order = col->IsSortOrderAscending();
+                            col->SetSortOrder(!order);
+                        }
+                        else if(model)
+                        {
+                            m_owner->SetSortingColumn(col);
+                        }
+                    }
+                    UpdateDisplay();
+                    if(model)
+                        model->Resort();
+                }
+

                 wxEventType evt = nmHDR->iButton == 0 ?
                         wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK :
                         wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK;
                 wxEventType evt = nmHDR->iButton == 0 ?
                         wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK :
                         wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK;


@@ -1271,32 +1557,20 @@ bool wxDataViewHeaderWindowMSW::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARA
     return true;
 }
 
     return true;
 }
 

-void wxDataViewHeaderWindowMSW::ScrollWindow(int WXUNUSED(dx), int WXUNUSED(dy),
-                                             const wxRect *WXUNUSED(rect))
+void wxDataViewHeaderWindowMSW::ScrollWindow(int dx, int WXUNUSED(dy),
+                                             const wxRect * WXUNUSED(rect))

 {
 {

-    wxSize ourSz = GetClientSize();
-    wxSize ownerSz = m_owner->GetClientSize();
-
-    // where should the (logical) origin of this window be placed?
-    int x1 = 0, y1 = 0;
-    m_owner->CalcUnscrolledPosition(0, 0, &x1, &y1);
-
-    // put this window on top of our parent and
-    SetWindowPos((HWND)m_hWnd, HWND_TOP, -x1, 0,
-                  ownerSz.GetWidth() + x1, ourSz.GetHeight(),
-                  SWP_SHOWWINDOW);
+    m_scrollOffsetX += dx;
+    
+    GetParent()->Layout();

 }
 
 }
 

-void wxDataViewHeaderWindowMSW::DoSetSize(int WXUNUSED(x), int WXUNUSED(y),
-                                          int WXUNUSED(w), int WXUNUSED(h),
-                                          int WXUNUSED(f))
+void wxDataViewHeaderWindowMSW::DoSetSize(int x, int y,
+                                          int w, int h,
+                                          int f)

 {
 {

-    // the wxDataViewCtrl's internal wxBoxSizer will call this function when
-    // the wxDataViewCtrl window gets resized: the following dummy call
-    // to ScrollWindow() is required in order to get this header window
-    // correctly repainted when it's (horizontally) scrolled:
-
-    ScrollWindow(0, 0);
+    // TODO: why is there a border + 2px around it?
+    wxControl::DoSetSize( x+m_scrollOffsetX+1, y+1, w-m_scrollOffsetX-2, h-2, f );

 }
 
 #else       // !defined(__WXMSW__)
 }
 
 #else       // !defined(__WXMSW__)


@@ -1367,7 +1641,7 @@ void wxGenericDataViewHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         int ch = h;
 
         wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE;
         int ch = h;
 
         wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE;

-        if (col->IsSortable())
+        if (col->IsSortable() && GetOwner()->GetSortingColumn() == col)

         {
             if (col->IsSortOrderAscending())
                 sortArrow = wxHDR_SORT_ICON_UP;
         {
             if (col->IsSortOrderAscending())
                 sortArrow = wxHDR_SORT_ICON_UP;


@@ -1375,13 +1649,23 @@ void wxGenericDataViewHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
                 sortArrow = wxHDR_SORT_ICON_DOWN;
         }
 
                 sortArrow = wxHDR_SORT_ICON_DOWN;
         }
 

+        int state = 0;
+        if (m_parent->IsEnabled())
+        {
+            if ((int) i == m_hover)
+                state = wxCONTROL_CURRENT;
+        }
+        else
+        {
+            state = (int) wxCONTROL_DISABLED;
+        }
+

         wxRendererNative::Get().DrawHeaderButton
                                 (
                                     this,
                                     dc,
                                     wxRect(xpos, 0, cw, ch-1),
         wxRendererNative::Get().DrawHeaderButton
                                 (
                                     this,
                                     dc,
                                     wxRect(xpos, 0, cw, ch-1),

-                                    m_parent->IsEnabled() ? 0
-                                                          : (int)wxCONTROL_DISABLED,
+                                    state,

                                     sortArrow
                                 );
 
                                     sortArrow
                                 );
 


@@ -1393,13 +1677,14 @@ void wxGenericDataViewHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         case wxALIGN_LEFT:
             x += HEADER_HORIZ_BORDER;
             break;
         case wxALIGN_LEFT:
             x += HEADER_HORIZ_BORDER;
             break;

+        case wxALIGN_RIGHT:
+            x += cw - titleSz.GetWidth() - HEADER_HORIZ_BORDER;
+            break;
+        default:

         case wxALIGN_CENTER:
         case wxALIGN_CENTER_HORIZONTAL:
             x += (cw - titleSz.GetWidth() - 2 * HEADER_HORIZ_BORDER)/2;
             break;
         case wxALIGN_CENTER:
         case wxALIGN_CENTER_HORIZONTAL:
             x += (cw - titleSz.GetWidth() - 2 * HEADER_HORIZ_BORDER)/2;
             break;

-        case wxALIGN_RIGHT:
-            x += cw - titleSz.GetWidth() - HEADER_HORIZ_BORDER;
-            break;

         }
 
         // always center the title vertically:
         }
 
         // always center the title vertically:


@@ -1438,10 +1723,6 @@ void wxGenericDataViewHeaderWindow::OnMouse( wxMouseEvent &event )
         m_owner->CalcUnscrolledPosition(w, 0, &w, NULL);
         w -= 6;
 
         m_owner->CalcUnscrolledPosition(w, 0, &w, NULL);
         w -= 6;
 

-        // erase the line if it was drawn
-        if (m_currentX < w)
-            DrawCurrent();
-

         if (event.ButtonUp())
         {
             m_isDragging = false;
         if (event.ButtonUp())
         {
             m_isDragging = false;


@@ -1449,19 +1730,15 @@ void wxGenericDataViewHeaderWindow::OnMouse( wxMouseEvent &event )
                 ReleaseMouse();
 
             m_dirty = true;
                 ReleaseMouse();
 
             m_dirty = true;

+        }
+        m_currentX = wxMax(m_minX + 7, x);

 
 

+        if (m_currentX < w)
+        {

             GetColumn(m_column)->SetWidth(m_currentX - m_minX);
             GetColumn(m_column)->SetWidth(m_currentX - m_minX);

-

             Refresh();
             GetOwner()->Refresh();
         }
             Refresh();
             GetOwner()->Refresh();
         }

-        else
-        {
-            m_currentX = wxMax(m_minX + 7, x);
-
-            // draw in the new location
-            if (m_currentX < w) DrawCurrent();
-        }

 
     }
     else     // not dragging
 
     }
     else     // not dragging


@@ -1500,6 +1777,13 @@ void wxGenericDataViewHeaderWindow::OnMouse( wxMouseEvent &event )
             m_minX = xpos;
         }
 
             m_minX = xpos;
         }
 

+        int old_hover = m_hover;
+        m_hover = m_column;
+        if (event.Leaving())
+            m_hover = wxNOT_FOUND;
+        if (old_hover != m_hover)
+            Refresh();
+

         if (m_column == wxNOT_FOUND)
             return;
 
         if (m_column == wxNOT_FOUND)
             return;
 


@@ -1516,14 +1800,38 @@ void wxGenericDataViewHeaderWindow::OnMouse( wxMouseEvent &event )
                 m_isDragging = true;
                 CaptureMouse();
                 m_currentX = x;
                 m_isDragging = true;
                 CaptureMouse();
                 m_currentX = x;

-                DrawCurrent();

             }
             else    // click on a column
             {
             }
             else    // click on a column
             {

+                wxDataViewModel * model = GetOwner()->GetModel();

                 wxEventType evt = event.LeftDown() ?
                         wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK :
                         wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK;
                 SendEvent(evt, m_column);
                 wxEventType evt = event.LeftDown() ?
                         wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK :
                         wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK;
                 SendEvent(evt, m_column);

+
+                //Left click the header
+                if(event.LeftDown())
+                {
+                    wxDataViewColumn *col = GetColumn(m_column);
+                    if(col->IsSortable())
+                    {
+                        wxDataViewColumn* sortCol = m_owner->GetSortingColumn();
+                        if(model && sortCol == col)
+                        {
+                            bool order = col->IsSortOrderAscending();
+                            col->SetSortOrder(!order);
+                        }
+                        else if(model)
+                        {
+                            m_owner->SetSortingColumn(col);
+                        }
+                    }
+                    UpdateDisplay();
+                    if(model)
+                        model->Resort();
+                    //Send the column sorted event
+                    SendEvent(wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED, m_column);
+                }

             }
         }
         else if (event.Moving())
             }
         }
         else if (event.Moving())


@@ -1538,28 +1846,6 @@ void wxGenericDataViewHeaderWindow::OnMouse( wxMouseEvent &event )
     }
 }
 
     }
 }
 

-void wxGenericDataViewHeaderWindow::DrawCurrent()
-{
-    int x1 = m_currentX;
-    int y1 = 0;
-    ClientToScreen (&x1, &y1);
-
-    int x2 = m_currentX-1;
-#ifdef __WXMSW__
-    ++x2; // but why ????
-#endif
-    int y2 = 0;
-    m_owner->GetClientSize( NULL, &y2 );
-    m_owner->ClientToScreen( &x2, &y2 );
-
-    wxScreenDC dc;
-    dc.SetLogicalFunction(wxINVERT);
-    dc.SetPen(m_penCurrent);
-    dc.SetBrush(*wxTRANSPARENT_BRUSH);
-    AdjustDC(dc);
-    dc.DrawLine(x1, y1, x2, y2);
-}
-

 void wxGenericDataViewHeaderWindow::AdjustDC(wxDC& dc)
 {
     int xpix, x;
 void wxGenericDataViewHeaderWindow::AdjustDC(wxDC& dc)
 {
     int xpix, x;


@@ -1615,7 +1901,7 @@ END_EVENT_TABLE()
 
 wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID id,
     const wxPoint &pos, const wxSize &size, const wxString &name ) :
 
 wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID id,
     const wxPoint &pos, const wxSize &size, const wxString &name ) :

-    wxWindow( parent, id, pos, size, wxWANTS_CHARS, name ),
+    wxWindow( parent, id, pos, size, wxWANTS_CHARS|wxBORDER_NONE, name ),

     m_selection( wxDataViewSelectionCmp )
 
 {
     m_selection( wxDataViewSelectionCmp )
 
 {


@@ -1628,14 +1914,7 @@ wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID i
     m_currentCol = NULL;
     m_currentRow = 0;
 
     m_currentCol = NULL;
     m_currentRow = 0;
 

-    // TODO: we need to calculate this smartly
-    m_lineHeight =
-#ifdef __WXMSW__
-        17;
-#else
-        20;
-#endif
-    wxASSERT(m_lineHeight > 2*PADDING_TOPBOTTOM);
+    m_lineHeight = wxMax( 17, GetCharHeight() + 2 ); // 17 = mini icon height + 1

 
     m_dragCount = 0;
     m_dragStart = wxPoint(0,0);
 
     m_dragCount = 0;
     m_dragStart = wxPoint(0,0);


@@ -1658,6 +1937,7 @@ wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID i
 
     //Make m_count = -1 will cause the class recaculate the real displaying number of rows.
     m_count = -1 ;
 
     //Make m_count = -1 will cause the class recaculate the real displaying number of rows.
     m_count = -1 ;

+    m_underMouse = NULL;

     UpdateDisplay();
 }
 
     UpdateDisplay();
 }
 


@@ -1695,6 +1975,7 @@ void wxDataViewMainWindow::OnRenameTimer()
 
     wxDataViewItem item = GetItemByRow( m_currentRow );
     m_currentCol->GetRenderer()->StartEditing( item, labelRect );
 
     wxDataViewItem item = GetItemByRow( m_currentRow );
     m_currentCol->GetRenderer()->StartEditing( item, labelRect );

+

 }
 
 //------------------------------------------------------------------
 }
 
 //------------------------------------------------------------------


@@ -1712,108 +1993,171 @@ public:
     // 2: Job not done, continue
     enum  { OK = 0 , IGR = 1, CONT = 2 };
     virtual int operator() ( wxDataViewTreeNode * node ) = 0 ;
     // 2: Job not done, continue
     enum  { OK = 0 , IGR = 1, CONT = 2 };
     virtual int operator() ( wxDataViewTreeNode * node ) = 0 ;

+    virtual int operator() ( void * n ) = 0;

 };
 
 };
 

-class ItemAddJob: public DoJob
+bool Walker( wxDataViewTreeNode * node, DoJob & func )

 {
 {

-public:
-    ItemAddJob( const wxDataViewItem & parent, const wxDataViewItem & item, int * count )
-       { this->parent = parent ; this->item = item ; m_count = count; }
-    virtual ~ItemAddJob(){};
+    if( node==NULL )
+        return false;

 
 

-    virtual int operator() ( wxDataViewTreeNode * node )
+    switch( func( node ) )

     {
     {

-        if( node->GetItem() == parent )
-        {
-            node->SetHasChildren( true );
-            wxDataViewTreeNode * newnode = new wxDataViewTreeNode( node );
-            newnode->SetItem(item);
-            node->AppendChild( newnode);
-            *m_count = -1;
-            return OK;
-        }
-        return CONT;
+        case DoJob::OK :
+            return true ;
+        case DoJob::IGR:
+            return false;
+        case DoJob::CONT:
+            default:
+                ;

     }
 
     }
 

-private:
-    int * m_count;
-    wxDataViewItem parent, item;
-};
+    wxDataViewTreeNodes nodes = node->GetNodes();
+    wxDataViewTreeLeaves leaves = node->GetChildren();

 
 

-bool Walker( wxDataViewTreeNode * node, DoJob & func )
-{
-    if( node==NULL ||  !node->HasChildren())
-        return false;
+    int len_nodes = nodes.GetCount();
+    int len = leaves.GetCount();
+    int i = 0, nodes_i = 0;

 
 

-    wxDataViewTreeNodes nodes = node->GetChildren();
-    int len = node->GetChildrenNumber();
-    int i = 0 ;

     for( ; i < len ; i ++ )
     {
     for( ; i < len ; i ++ )
     {

-        wxDataViewTreeNode * n = nodes[i];
-        switch( func( n ) )
+        void * n = leaves[i];
+        if( nodes_i < len_nodes && n == nodes[nodes_i]->GetItem().GetID() )

         {
         {

-            case DoJob::OK :
-                return true ;
-            case DoJob::IGR:
-                continue;
-            case DoJob::CONT:
-            default:
-                ;
+            wxDataViewTreeNode * nd = nodes[nodes_i];
+            nodes_i++;
+
+            if( Walker( nd , func ) )
+                return true;
+

         }
         }

-        
-        if( Walker( n , func ) )
-            return true;
+        else
+            switch( func( n ) )
+            {
+                case DoJob::OK :
+                    return true ;
+                case DoJob::IGR:
+                    continue;
+                case DoJob::CONT:
+                default:
+                    ;
+            }

     }
     return false;
 }
 
 bool wxDataViewMainWindow::ItemAdded(const wxDataViewItem & parent, const wxDataViewItem & item)
 {
     }
     return false;
 }
 
 bool wxDataViewMainWindow::ItemAdded(const wxDataViewItem & parent, const wxDataViewItem & item)
 {

-    ItemAddJob job( parent, item, &m_count); 
-    Walker( m_root , job);
-    UpdateDisplay();
-    return true;
+    SortPrepare();
+
+    wxDataViewTreeNode * node;
+    node = FindNode(parent);
+
+    if( node == NULL )
+        return false;
+
+    node->SetHasChildren( true );
+
+    if( g_model->IsContainer( item ) )
+    {
+        wxDataViewTreeNode * newnode = new wxDataViewTreeNode( node );
+        newnode->SetItem(item);
+        newnode->SetHasChildren( true );
+        node->AddNode( newnode);
+    }
+    else
+        node->AddLeaf( item.GetID() );
+
+    node->ChangeSubTreeCount(1);
+
+    m_count = -1;
+    UpdateDisplay();
+
+    return true;

 }
 
 }
 

-class ItemDeleteJob: public DoJob
+void DestroyTreeHelper( wxDataViewTreeNode * node);
+
+bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
+                                       const wxDataViewItem& item)

 {
 {

-public:
-    ItemDeleteJob( const wxDataViewItem & item, int * count ) { m_item = item; m_count = count; }
-    virtual ~ItemDeleteJob(){}
-    virtual int operator() ( wxDataViewTreeNode * node )
+    wxDataViewTreeNode * node = FindNode(parent);
+
+    wxCHECK_MSG( node != NULL, false, "item not found" );
+    wxCHECK_MSG( node->GetChildren().Index( item.GetID() ) != wxNOT_FOUND, false, "item not found" );
+
+    int sub = -1;
+    node->GetChildren().Remove( item.GetID() );
+    //Manuplate selection
+    if( m_selection.GetCount() > 1 )

     {
     {

-        if( node->GetItem() == m_item )
+        m_selection.Empty();
+    }
+    bool isContainer = false;
+    wxDataViewTreeNodes nds = node->GetNodes();
+    for (size_t i = 0; i < nds.GetCount(); i ++)
+    {
+        if (nds[i]->GetItem() == item)

         {
         {

-            node->GetParent()->GetChildren().Remove( node );
-            delete node;
-            *m_count = -1;
-            return DoJob::OK;
+            isContainer = true;
+            break;

         }
         }

-        return DoJob::CONT;
+    }
+    if( isContainer )
+    {
+        wxDataViewTreeNode * n = NULL;
+        wxDataViewTreeNodes nodes = node->GetNodes();
+        int len = nodes.GetCount();
+        for( int i = 0 ; i < len; i ++)
+        {
+            if( nodes[i]->GetItem() == item )
+            {
+                n = nodes[i];
+                break;
+            }
+        }
+
+        wxCHECK_MSG( n != NULL, false, "item not found" );
+
+        node->GetNodes().Remove( n );
+        sub -= n->GetSubTreeCount();
+        DestroyTreeHelper(n);
+    }
+    //Make the row number invalid and get a new valid one when user call GetRowCount
+    m_count = -1;
+    node->ChangeSubTreeCount(sub);
+    if( node->GetChildrenNumber() == 0)
+    {
+        node->GetParent()->GetNodes().Remove( node );
+        delete node;

     }
 
     }
 

-private:
-    int * m_count;
-    wxDataViewItem m_item;
-};
+    //Change the current row to the last row if the current exceed the max row number
+    if( m_currentRow > GetRowCount() )
+        m_currentRow = m_count - 1;

 
 

-bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem & item)
-{
-    ItemDeleteJob job( item, &m_count);
-    Walker( m_root, job);

     UpdateDisplay();
     UpdateDisplay();

+

     return true;
 }
 
 bool wxDataViewMainWindow::ItemChanged(const wxDataViewItem & item)
 {
     return true;
 }
 
 bool wxDataViewMainWindow::ItemChanged(const wxDataViewItem & item)
 {

-    unsigned int row = GetRowByItem(item);
-    RefreshRow( row );
+    SortPrepare();
+    g_model->Resort();
+
+    //Send event
+    wxWindow *parent = GetParent();
+    wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, parent->GetId());
+    le.SetEventObject(parent);
+    le.SetModel(GetOwner()->GetModel());
+    le.SetItem(item);
+    parent->GetEventHandler()->ProcessEvent(le);
+

     return true;
 }
 
     return true;
 }
 

-bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned int WXUNUSED(col) )
+bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned int col )

 {
     // NOTE: to be valid, we cannot use e.g. INT_MAX - 1
 /*#define MAX_VIRTUAL_WIDTH       100000
 {
     // NOTE: to be valid, we cannot use e.g. INT_MAX - 1
 /*#define MAX_VIRTUAL_WIDTH       100000


@@ -1824,15 +2168,29 @@ bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned i
 
     return true;
 */
 
     return true;
 */

-    unsigned int row = GetRowByItem(item);
-    RefreshRow( row );
+    SortPrepare();
+    g_model->Resort();
+
+    //Send event
+    wxWindow *parent = GetParent();
+    wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, parent->GetId());
+    le.SetEventObject(parent);
+    le.SetModel(GetOwner()->GetModel());
+    le.SetItem(item);
+    le.SetColumn(col);
+    le.SetDataViewColumn(GetOwner()->GetColumn(col));
+    parent->GetEventHandler()->ProcessEvent(le);
+

     return true;
 }
 
 bool wxDataViewMainWindow::Cleared()
 {
     return true;
 }
 
 bool wxDataViewMainWindow::Cleared()
 {

+    SortPrepare();
+

     DestroyTree();
     UpdateDisplay();
     DestroyTree();
     UpdateDisplay();

+

     return true;
 }
 
     return true;
 }
 


@@ -1878,6 +2236,43 @@ void wxDataViewMainWindow::ScrollWindow( int dx, int dy, const wxRect *rect )
         GetOwner()->m_headerArea->ScrollWindow( dx, 0 );
 }
 
         GetOwner()->m_headerArea->ScrollWindow( dx, 0 );
 }
 

+void wxDataViewMainWindow::ScrollTo( int rows, int column )
+{
+    int x, y;
+    m_owner->GetScrollPixelsPerUnit( &x, &y );
+    int sy = rows*m_lineHeight/y;
+    int sx = 0;
+    if( column != -1 )
+    {
+        wxRect rect = GetClientRect();
+        int colnum = 0;
+        int x_start = 0, x_end = 0, w = 0;
+        int xx, yy, xe;
+        m_owner->CalcUnscrolledPosition( rect.x, rect.y, &xx, &yy );
+        for (x_start = 0; colnum < column; colnum++)
+        {
+            wxDataViewColumn *col = GetOwner()->GetColumn(colnum);
+            if (col->IsHidden())
+                continue;      // skip it!
+
+            w = col->GetWidth();
+            x_start += w;
+        }
+
+        x_end = x_start + w;
+        xe = xx + rect.width;
+        if( x_end > xe )
+        {
+            sx = ( xx + x_end - xe )/x;
+        }
+        if( x_start < xx )
+        {
+            sx = x_start/x;
+        }
+    }
+    m_owner->Scroll( sx, sy );
+}
+

 void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 {
     wxDataViewModel *model = GetOwner()->GetModel();
 void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 {
     wxDataViewModel *model = GetOwner()->GetModel();


@@ -1896,7 +2291,7 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
     unsigned int item_start = wxMax( 0, (update.y / m_lineHeight) );
     unsigned int item_count =
         wxMin( (int)(((update.y + update.height) / m_lineHeight) - item_start + 1),
     unsigned int item_start = wxMax( 0, (update.y / m_lineHeight) );
     unsigned int item_count =
         wxMin( (int)(((update.y + update.height) / m_lineHeight) - item_start + 1),

-               (int)(GetRowCount( )- item_start) );
+               (int)(GetRowCount( ) - item_start));

     unsigned int item_last = item_start + item_count;
 
     // compute which columns needs to be redrawn
     unsigned int item_last = item_start + item_count;
 
     // compute which columns needs to be redrawn


@@ -1990,6 +2385,14 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         }
     }
 
         }
     }
 

+    wxDataViewColumn *expander = GetOwner()->GetExpanderColumn();
+    if (!expander)
+    {
+        // TODO: last column for RTL support
+        expander = GetOwner()->GetColumn( 0 );
+        GetOwner()->SetExpanderColumn(expander);
+    }
+

     // redraw all cells for all rows which must be repainted and for all columns
     wxRect cell_rect;
     cell_rect.x = x_start;
     // redraw all cells for all rows which must be repainted and for all columns
     wxRect cell_rect;
     cell_rect.x = x_start;


@@ -2003,26 +2406,51 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         if (col->IsHidden())
             continue;       // skipt it!
 
         if (col->IsHidden())
             continue;       // skipt it!
 

+

         for (unsigned int item = item_start; item < item_last; item++)
         {
             // get the cell value and set it into the renderer
             wxVariant value;
         for (unsigned int item = item_start; item < item_last; item++)
         {
             // get the cell value and set it into the renderer
             wxVariant value;

-            wxDataViewTreeNode * node = GetTreeNodeByRow(item);
-            if( node == NULL )
-                continue;
-                
-            wxDataViewItem dataitem = node->GetItem();
-            model->GetValue( value, dataitem, col->GetModelColumn());
+            wxDataViewTreeNode *node = NULL;
+            wxDataViewItem dataitem;
+            
+            if (m_root)
+            {
+                node = GetTreeNodeByRow(item);
+                if( node == NULL )
+                    continue;
+
+                dataitem = node->GetItem();
+
+                if ((i > 0) && model->IsContainer(dataitem) && !model->HasContainerColumns(dataitem))
+                    continue;
+            }
+            else
+            {
+                dataitem = wxDataViewItem( (void*) item );
+            }
+
+            model->GetValue( value, dataitem, col->GetModelColumn());

             cell->SetValue( value );
             cell->SetValue( value );

+            
+            if (cell->GetWantsAttr())
+            {
+                wxDataViewItemAttr attr;
+                bool ret = model->GetAttr( dataitem, col->GetModelColumn(), attr );
+                if (ret)
+                    cell->SetAttr( attr );
+                cell->SetHasAttr( ret );
+            }

 
             // update the y offset
             cell_rect.y = item * m_lineHeight;
 
 
             // update the y offset
             cell_rect.y = item * m_lineHeight;
 

-            //Draw the expander here. Please notice that I use const number for all pixel data. When the final API are determined
-            //I will change this to the data member of the class wxDataViewCtrl
-            int indent = node->GetIndentLevel();
-            if( col->GetModelColumn() == GetOwner()->GetExpanderColumn() )
+            //Draw the expander here.
+            int indent = 0;
+            if ((m_root) && (col == expander))

             {
             {

+                indent = node->GetIndentLevel();
+                

                 //Calculate the indent first
                 indent = cell_rect.x + GetOwner()->GetIndent() * indent;
 
                 //Calculate the indent first
                 indent = cell_rect.x + GetOwner()->GetIndent() * indent;
 


@@ -2034,29 +2462,37 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
                 dc.SetBrush( wxNullBrush );
                 if( node->HasChildren() )
                 {
                 dc.SetBrush( wxNullBrush );
                 if( node->HasChildren() )
                 {

-                    //dc.DrawRoundedRectangle( expander_x,expander_y,expander_width,expander_width, 1.0);
-                    //dc.DrawLine( expander_x + 2 , expander_y + expander_width/2, expander_x + expander_width - 2, expander_y + expander_width/2 );

                     wxRect rect( expander_x , expander_y, expander_width, expander_width);
                     wxRect rect( expander_x , expander_y, expander_width, expander_width);

+                    int flag = 0;
+                    if (m_underMouse == node)
+                    {
+                        flag |= wxCONTROL_CURRENT;
+                    }

                     if( node->IsOpen() )
                     if( node->IsOpen() )

-                        wxRendererNative::Get().DrawTreeItemButton( this, dc, rect, wxCONTROL_EXPANDED );
+                        wxRendererNative::Get().DrawTreeItemButton( this, dc, rect, flag|wxCONTROL_EXPANDED );

                     else
                     else

-                        wxRendererNative::Get().DrawTreeItemButton( this, dc, rect );
+                        wxRendererNative::Get().DrawTreeItemButton( this, dc, rect, flag);

                 }
                 else
                 {
                 }
                 else
                 {

-                 // I am wandering whether we should draw dot lines between tree nodes
+                     // I am wondering whether we should draw dot lines between tree nodes
+                     if (node)
+                         delete node;
+                     // Yes, if the node does not have any child, it must be a leaf which 
+                     // mean that it is a temporarily created by GetTreeNodeByRow

                 }
 
                  //force the expander column to left-center align
                  cell->SetAlignment( wxALIGN_CENTER_VERTICAL );
             }
                 }
 
                  //force the expander column to left-center align
                  cell->SetAlignment( wxALIGN_CENTER_VERTICAL );
             }

-            

 
 

-            // cannot be bigger than allocated space 
+
+            // cannot be bigger than allocated space

             wxSize size = cell->GetSize();
             // Because of the tree structure indent, here we should minus the width of the cell for drawing
             size.x = wxMin( size.x + 2*PADDING_RIGHTLEFT, cell_rect.width - indent );
             wxSize size = cell->GetSize();
             // Because of the tree structure indent, here we should minus the width of the cell for drawing
             size.x = wxMin( size.x + 2*PADDING_RIGHTLEFT, cell_rect.width - indent );

-            size.y = wxMin( size.y + 2*PADDING_TOPBOTTOM, cell_rect.height );
+            // size.y = wxMin( size.y, cell_rect.height );
+            size.y = cell_rect.height;

 
             wxRect item_rect(cell_rect.GetTopLeft(), size);
             int align = cell->GetAlignment();
 
             wxRect item_rect(cell_rect.GetTopLeft(), size);
             int align = cell->GetAlignment();


@@ -2079,15 +2515,13 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
             // add padding
             item_rect.x += PADDING_RIGHTLEFT;
 
             // add padding
             item_rect.x += PADDING_RIGHTLEFT;

-            item_rect.y += PADDING_TOPBOTTOM;

             item_rect.width = size.x - 2 * PADDING_RIGHTLEFT;
             item_rect.width = size.x - 2 * PADDING_RIGHTLEFT;

-            item_rect.height = size.y - 2 * PADDING_TOPBOTTOM;

 
             //Here we add the tree indent
             item_rect.x += indent;
 
             //Here we add the tree indent
             item_rect.x += indent;

-                  
+

             int state = 0;
             int state = 0;

-            if (m_selection.Index(item) != wxNOT_FOUND)
+            if (m_hasFocus && (m_selection.Index(item) != wxNOT_FOUND))

                 state |= wxDATAVIEW_CELL_SELECTED;
 
             // TODO: it would be much more efficient to create a clipping
                 state |= wxDATAVIEW_CELL_SELECTED;
 
             // TODO: it would be much more efficient to create a clipping


@@ -2136,16 +2570,19 @@ unsigned int wxDataViewMainWindow::GetFirstVisibleRow() const
     return y / m_lineHeight;
 }
 
     return y / m_lineHeight;
 }
 

-unsigned int wxDataViewMainWindow::GetLastVisibleRow() 
+unsigned int wxDataViewMainWindow::GetLastVisibleRow()

 {
     wxSize client_size = GetClientSize();
     m_owner->CalcUnscrolledPosition( client_size.x, client_size.y,
                                      &client_size.x, &client_size.y );
 
 {
     wxSize client_size = GetClientSize();
     m_owner->CalcUnscrolledPosition( client_size.x, client_size.y,
                                      &client_size.x, &client_size.y );
 

-    return wxMin( GetRowCount()-1, ((unsigned)client_size.y/m_lineHeight)+1 );
+    //we should deal with the pixel here
+    unsigned int row = ((client_size.y)/m_lineHeight) - 1;
+
+    return wxMin( GetRowCount()-1, row );

 }
 
 }
 

-unsigned int wxDataViewMainWindow::GetRowCount() 
+unsigned int wxDataViewMainWindow::GetRowCount()

 {
     if ( m_count == -1 )
     {
 {
     if ( m_count == -1 )
     {


@@ -2264,6 +2701,18 @@ bool wxDataViewMainWindow::IsRowSelected( unsigned int row )
     return (m_selection.Index( row ) != wxNOT_FOUND);
 }
 
     return (m_selection.Index( row ) != wxNOT_FOUND);
 }
 

+void wxDataViewMainWindow::SendSelectionChangedEvent( const wxDataViewItem& item)
+{
+    wxWindow *parent = GetParent();
+    wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED, parent->GetId());
+
+    le.SetEventObject(parent);
+    le.SetModel(GetOwner()->GetModel());
+    le.SetItem( item );
+
+    parent->GetEventHandler()->ProcessEvent(le);
+}
+

 void wxDataViewMainWindow::RefreshRow( unsigned int row )
 {
     wxRect rect( 0, row*m_lineHeight, GetEndOfLastCol(), m_lineHeight );
 void wxDataViewMainWindow::RefreshRow( unsigned int row )
 {
     wxRect rect( 0, row*m_lineHeight, GetEndOfLastCol(), m_lineHeight );


@@ -2338,6 +2787,8 @@ void wxDataViewMainWindow::OnArrowChar(unsigned int newCurrent, const wxKeyEvent
         }
 
         SelectRows( oldCurrent, newCurrent, true );
         }
 
         SelectRows( oldCurrent, newCurrent, true );

+        if (oldCurrent!=newCurrent)
+            SendSelectionChangedEvent(GetItemByRow(m_selection[0]));

     }
     else // !shift
     {
     }
     else // !shift
     {


@@ -2350,12 +2801,15 @@ void wxDataViewMainWindow::OnArrowChar(unsigned int newCurrent, const wxKeyEvent
         ChangeCurrentRow( newCurrent );
 
         if ( !event.ControlDown() )
         ChangeCurrentRow( newCurrent );
 
         if ( !event.ControlDown() )

+        {

             SelectRow( m_currentRow, true );
             SelectRow( m_currentRow, true );

+            SendSelectionChangedEvent(GetItemByRow(m_currentRow));
+        }

         else
             RefreshRow( m_currentRow );
     }
 
         else
             RefreshRow( m_currentRow );
     }
 

-    //EnsureVisible( m_currentRow );
+    GetOwner()->EnsureVisible( m_currentRow, -1 );

 }
 
 wxRect wxDataViewMainWindow::GetLineRect( unsigned int row ) const
 }
 
 wxRect wxDataViewMainWindow::GetLineRect( unsigned int row ) const


@@ -2376,19 +2830,43 @@ public:
     virtual ~RowToItemJob(){};
 
     virtual int operator() ( wxDataViewTreeNode * node )
     virtual ~RowToItemJob(){};
 
     virtual int operator() ( wxDataViewTreeNode * node )

-       {
-           if( current == static_cast<int>(row))
-           {
-               ret = node->GetItem() ;
-               return DoJob::OK;
-           }
-           current ++;
-           if ( node->IsOpen())
-               return DoJob::CONT;
-           else
-               return DoJob::IGR;
-       }
+    {
+        current ++;
+        if( current == static_cast<int>(row))
+         {
+            ret = node->GetItem() ;
+            return DoJob::OK;
+        }

 
 

+        if( node->GetSubTreeCount() + current < static_cast<int>(row) )
+        {
+            current += node->GetSubTreeCount();
+            return  DoJob::IGR;
+        }
+        else
+        {
+            //If the current has no child node, we can find the desired item of the row number directly.
+            //This if can speed up finding in some case, and will has a very good effect when it comes to list view
+            if( node->GetNodes().GetCount() == 0)
+            {
+                int index = static_cast<int>(row) - current - 1;
+                ret = node->GetChildren().Item( index );
+                return DoJob::OK;
+            }
+            return DoJob::CONT;
+        }
+    }
+
+    virtual int operator() ( void * n )
+    {
+        current ++;
+        if( current == static_cast<int>(row))
+         {
+            ret = wxDataViewItem( n ) ;
+            return DoJob::OK;
+        }
+        return DoJob::CONT;
+    }

     wxDataViewItem GetResult(){ return ret; }
 private:
     unsigned int row;
     wxDataViewItem GetResult(){ return ret; }
 private:
     unsigned int row;


@@ -2396,70 +2874,114 @@ private:
     wxDataViewItem ret;
 };
 
     wxDataViewItem ret;
 };
 

-wxDataViewItem wxDataViewMainWindow::GetItemByRow(unsigned int row)
+wxDataViewItem wxDataViewMainWindow::GetItemByRow(unsigned int row) const

 {
 {

-    RowToItemJob job( row, 0 );
-    Walker( m_root , job );
-    return job.GetResult();
+    if (!m_root)
+    {
+        return wxDataViewItem( (void*) row );
+    }
+    else
+    {
+        RowToItemJob job( row, -2 );
+        Walker( m_root , job );
+        return job.GetResult();
+    }

 }
 
 class RowToTreeNodeJob: public DoJob
 {
 public:
 }
 
 class RowToTreeNodeJob: public DoJob
 {
 public:

-    RowToTreeNodeJob( unsigned int row , int current ) { this->row = row; this->current = current ; ret = NULL ; }
+    RowToTreeNodeJob( unsigned int row , int current, wxDataViewTreeNode * node )
+    {
+        this->row = row;
+        this->current = current ;
+        ret = NULL ;
+        parent = node;
+    }

     virtual ~RowToTreeNodeJob(){};
 
     virtual int operator() ( wxDataViewTreeNode * node )
     {
     virtual ~RowToTreeNodeJob(){};
 
     virtual int operator() ( wxDataViewTreeNode * node )
     {

+        current ++;

         if( current == static_cast<int>(row))
         if( current == static_cast<int>(row))

-        {
+         {

             ret = node ;
             return DoJob::OK;
         }
             ret = node ;
             return DoJob::OK;
         }

-        current ++;
-        if ( node->IsOpen())
-            return DoJob::CONT;
+
+        if( node->GetSubTreeCount() + current < static_cast<int>(row) )
+        {
+            current += node->GetSubTreeCount();
+            return  DoJob::IGR;
+        }

         else
         else

-            return DoJob::IGR;
+        {
+            parent = node;
+            //If the current has no child node, we can find the desired item of the row number directly.
+            //This if can speed up finding in some case, and will has a very good effect when it comes to list view
+            if( node->GetNodes().GetCount() == 0)
+            {
+                int index = static_cast<int>(row) - current - 1;
+                void * n = node->GetChildren().Item( index );
+                ret = new wxDataViewTreeNode( parent ) ;
+                ret->SetItem( wxDataViewItem( n ));
+                ret->SetHasChildren(false);
+                return DoJob::OK;
+            }
+            return DoJob::CONT;
+        }
+
+

     }
 
     }
 

+    virtual int operator() ( void * n )
+    {
+        current ++;
+        if( current == static_cast<int>(row))
+         {
+            ret = new wxDataViewTreeNode( parent ) ;
+            ret->SetItem( wxDataViewItem( n ));
+            ret->SetHasChildren(false);
+            return DoJob::OK;
+        }
+
+        return DoJob::CONT;
+    }

     wxDataViewTreeNode * GetResult(){ return ret; }
 private:
     unsigned int row;
     int current ;
     wxDataViewTreeNode * ret;
     wxDataViewTreeNode * GetResult(){ return ret; }
 private:
     unsigned int row;
     int current ;
     wxDataViewTreeNode * ret;

+    wxDataViewTreeNode * parent ;

 };
 
 
 wxDataViewTreeNode * wxDataViewMainWindow::GetTreeNodeByRow(unsigned int row)
 {
 };
 
 
 wxDataViewTreeNode * wxDataViewMainWindow::GetTreeNodeByRow(unsigned int row)
 {

-    RowToTreeNodeJob job( row , 0 );
-    Walker( m_root , job );
-    return job.GetResult();
-}
-
-class CountJob : public DoJob
-{
-public:
-    CountJob(){ count = 0 ; }
-    virtual ~CountJob(){};
-       
-    virtual int operator () (  wxDataViewTreeNode * node )
+    if (!m_root)

     {
     {

-         count ++;
-         if ( node->IsOpen())
-             return DoJob::CONT;
-         else
-             return DoJob::IGR;
+        return NULL;

     }
     }

-
-    unsigned int GetResult()
+    else

     {
     {

-        return count ;
+        RowToTreeNodeJob job( row , -2, m_root );
+        Walker( m_root , job );
+        return job.GetResult();

     }
     }

-private:
-    unsigned int count;
-};
+}
+
+wxDataViewEvent wxDataViewMainWindow::SendExpanderEvent( wxEventType type, const wxDataViewItem & item )
+{
+    wxWindow *parent = GetParent();
+    wxDataViewEvent le(type, parent->GetId());
+
+    le.SetEventObject(parent);
+    le.SetModel(GetOwner()->GetModel());
+    le.SetItem( item );
+
+    parent->GetEventHandler()->ProcessEvent(le);
+    return le;
+}

 
 void wxDataViewMainWindow::OnExpanding( unsigned int row )
 {
 
 void wxDataViewMainWindow::OnExpanding( unsigned int row )
 {


@@ -2467,15 +2989,36 @@ void wxDataViewMainWindow::OnExpanding( unsigned int row )
     if( node != NULL )
     {
         if( node->HasChildren())
     if( node != NULL )
     {
         if( node->HasChildren())

+        {

             if( !node->IsOpen())
             {
             if( !node->IsOpen())
             {

+               wxDataViewEvent e = SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING,node->GetItem());
+               //Check if the user prevent expanding
+               if( e.GetSkipped() )
+                    return;
+

                node->ToggleOpen();
                //Here I build the children of current node
                if( node->GetChildrenNumber() == 0 )
                node->ToggleOpen();
                //Here I build the children of current node
                if( node->GetChildrenNumber() == 0 )

+               {
+                   SortPrepare();

                    BuildTreeHelper(GetOwner()->GetModel(), node->GetItem(), node);
                    BuildTreeHelper(GetOwner()->GetModel(), node->GetItem(), node);

+               }

                m_count = -1;
                m_count = -1;

-               Refresh();
+               UpdateDisplay();
+               //Send the expanded event
+               SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED,node->GetItem());

             }
             }

+            else
+            {
+                SelectRow( row, false );
+                SelectRow( row + 1, true );
+                ChangeCurrentRow( row + 1 );
+                SendSelectionChangedEvent( GetItemByRow(row+1));
+            }
+        }
+        else
+            delete node;

     }
 }
 
     }
 }
 


@@ -2484,98 +3027,285 @@ void wxDataViewMainWindow::OnCollapsing(unsigned int row)
     wxDataViewTreeNode * node = GetTreeNodeByRow(row);
     if( node != NULL )
     {
     wxDataViewTreeNode * node = GetTreeNodeByRow(row);
     if( node != NULL )
     {

+        wxDataViewTreeNode * nd = node;
+

         if( node->HasChildren() && node->IsOpen() )
         {
         if( node->HasChildren() && node->IsOpen() )
         {

+            wxDataViewEvent e = SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING,node->GetItem());
+            if( e.GetSkipped() )
+                return;

             node->ToggleOpen();
             m_count = -1;
             node->ToggleOpen();
             m_count = -1;

-            Refresh();
-            //RefreshRows(row,GetLastVisibleRow());
-         }
-         else
-         {
-             node = node->GetParent();
-             if( node != NULL )
-             {
-                 int  parent = GetRowByItem( node->GetItem()) ;
-                 SelectRow( row, false);
-                 SelectRow(parent , true );
-                 ChangeCurrentRow( parent );
-             }
-         }
+            UpdateDisplay();
+            SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED,nd->GetItem());
+        }
+        else
+        {
+            node = node->GetParent();
+            if( node != NULL )
+            {
+                int  parent = GetRowByItem( node->GetItem() ) ;
+                if( parent >= 0 )
+                {
+                    SelectRow( row, false);
+                    SelectRow(parent , true );
+                    ChangeCurrentRow( parent );
+                    SendSelectionChangedEvent( node->GetItem() );
+                }
+            }
+        }
+        if( !nd->HasChildren())
+            delete nd;
+    }
+}
+
+wxDataViewTreeNode * wxDataViewMainWindow::FindNode( const wxDataViewItem & item )
+{
+    wxDataViewModel * model = GetOwner()->GetModel();
+    if( model == NULL )
+        return NULL;
+
+    //Compose the a parent-chain of the finding item
+    ItemList list;
+    list.DeleteContents( true );
+    wxDataViewItem it( item );
+    while( it.IsOk() )
+    {
+        wxDataViewItem * pItem = new wxDataViewItem( it );
+        list.Insert( pItem );
+        it = model->GetParent( it );
+    }
+
+    //Find the item along the parent-chain.
+    //This algorithm is designed to speed up the node-finding method
+    wxDataViewTreeNode * node = m_root;
+    for( ItemList::const_iterator iter = list.begin(); iter !=list.end() ; iter++ )
+    {
+        if( node->HasChildren() )
+        {
+            if( node->GetChildrenNumber() == 0 )
+            {
+                SortPrepare();
+                BuildTreeHelper(model, node->GetItem(), node);
+            }
+
+            wxDataViewTreeNodes nodes = node->GetNodes();
+            unsigned int i = 0;
+            for (; i < nodes.GetCount(); i ++)
+            {
+                if (nodes[i]->GetItem() == (**iter))
+                {
+                    node = nodes[i];
+                    break;
+                }
+            }
+            if (i == nodes.GetCount())
+                return NULL;
+        }
+        else
+            return NULL;
+    }
+    return node;
+}
+
+void wxDataViewMainWindow::HitTest( const wxPoint & point, wxDataViewItem & item, wxDataViewColumn* &column )
+{
+    wxDataViewColumn *col = NULL;
+    unsigned int cols = GetOwner()->GetColumnCount();
+    unsigned int colnum = 0;
+    unsigned int x_start = 0;
+    int x, y;
+    m_owner->CalcUnscrolledPosition( point.x, point.y, &x, &y );
+    for (x_start = 0; colnum < cols; colnum++)
+    {
+        col = GetOwner()->GetColumn(colnum);
+        if (col->IsHidden())
+            continue;      // skip it!
+
+        unsigned int w = col->GetWidth();
+        if (x_start+w >= (unsigned int)x)
+            break;
+
+        x_start += w;

     }
     }

+
+    column = col;
+    item = GetItemByRow( y/m_lineHeight );

 }
 
 }
 

-int wxDataViewMainWindow::RecalculateCount() 
+wxRect wxDataViewMainWindow::GetItemRect( const wxDataViewItem & item, const wxDataViewColumn* column )

 {
 {

-    CountJob job;
-    Walker( m_root, job );
-    return job.GetResult();
+    int row = GetRowByItem(item);
+    int y = row*m_lineHeight;
+    int h = m_lineHeight;
+    int x = 0;
+    wxDataViewColumn *col = NULL;
+    for( int i = 0, cols = GetOwner()->GetColumnCount(); i < cols; i ++ )
+    {
+       col = GetOwner()->GetColumn( i );
+       x += col->GetWidth();
+       if( GetOwner()->GetColumn(i+1) == column )
+           break;
+    }
+    int w = col->GetWidth();
+    m_owner->CalcScrolledPosition( x, y, &x, &y );
+    return wxRect(x, y, w, h);
+}
+
+int wxDataViewMainWindow::RecalculateCount()
+{
+    if (!m_root)
+    {
+        wxDataViewIndexListModel *list_model = (wxDataViewIndexListModel*) GetOwner()->GetModel();
+#ifndef __WXMAC__
+        return list_model->GetLastIndex() + 1;
+#else
+        return list_model->GetLastIndex() - 1;
+#endif
+    }
+    else
+    {
+        return m_root->GetSubTreeCount();
+    }

 }
 
 class ItemToRowJob : public DoJob
 {
 public:
 }
 
 class ItemToRowJob : public DoJob
 {
 public:

-    ItemToRowJob(const wxDataViewItem & item){ this->item = item ; ret = 0 ; }
+    ItemToRowJob(const wxDataViewItem & item, ItemList::const_iterator iter )
+    { this->item = item ; ret = -1 ; m_iter = iter ; }

     virtual ~ItemToRowJob(){};
 
     virtual ~ItemToRowJob(){};
 

+    //Maybe binary search will help to speed up this process

     virtual int operator() ( wxDataViewTreeNode * node)
     {
          ret ++;
          if( node->GetItem() == item )
     virtual int operator() ( wxDataViewTreeNode * node)
     {
          ret ++;
          if( node->GetItem() == item )

+         {

              return DoJob::OK;
              return DoJob::OK;

+         }

 
 

-         if( node->IsOpen())
+         if( node->GetItem() == **m_iter )
+         {
+             m_iter++ ;

              return DoJob::CONT;
              return DoJob::CONT;

+         }

          else
          else

+         {
+             ret += node->GetSubTreeCount();

              return DoJob::IGR;
              return DoJob::IGR;

+         }
+

     }
 
     }
 

+    virtual int operator() ( void * n )
+    {
+        ret ++;
+        if( n == item.GetID() )
+            return DoJob::OK;
+        return DoJob::CONT;
+    }

     //the row number is begin from zero
     int GetResult(){ return ret -1 ; }
 private:
     //the row number is begin from zero
     int GetResult(){ return ret -1 ; }
 private:

+    ItemList::const_iterator  m_iter;

     wxDataViewItem item;
     int ret;
     wxDataViewItem item;
     int ret;

+

 };
 
 };
 

-unsigned int wxDataViewMainWindow::GetRowByItem(const wxDataViewItem & item)
+int wxDataViewMainWindow::GetRowByItem(const wxDataViewItem & item)

 {
 {

-    ItemToRowJob job( item );
-    Walker(m_root , job );
-    return job.GetResult();
+    wxDataViewModel * model = GetOwner()->GetModel();
+    if( model == NULL )
+        return -1;
+
+    if (!m_root)
+    {
+        return wxPtrToUInt( item.GetID() );
+    }
+    else
+    {
+        if( !item.IsOk() )
+            return -1;
+
+        //Compose the a parent-chain of the finding item
+        ItemList list;
+        wxDataViewItem * pItem = NULL;
+        list.DeleteContents( true );
+        wxDataViewItem it( item );
+        while( it.IsOk() )
+        {
+            pItem = new wxDataViewItem( it );
+            list.Insert( pItem );
+            it = model->GetParent( it );
+        }
+        pItem = new wxDataViewItem( );
+        list.Insert( pItem );
+
+        ItemToRowJob job( item, list.begin() );
+        Walker(m_root , job );
+        return job.GetResult();
+    }

 }
 
 void BuildTreeHelper( wxDataViewModel * model,  wxDataViewItem & item, wxDataViewTreeNode * node)
 {
 }
 
 void BuildTreeHelper( wxDataViewModel * model,  wxDataViewItem & item, wxDataViewTreeNode * node)
 {

-    if( !model->HasChildren( item ) )
+    if( !model->IsContainer( item ) )

         return ;
         return ;

-    
-    wxDataViewItem i = model->GetFirstChild( item );
-    while( i.IsOk() )
+
+    wxDataViewItemArray children;
+    unsigned int num = model->GetChildren( item, children);
+    unsigned int index = 0;
+    while( index < num )

     {
     {

-        wxDataViewTreeNode * n = new wxDataViewTreeNode( node );
-        n->SetItem(i);
-        n->SetHasChildren( model->HasChildren( i )) ;
-        node->AppendChild(n);
-        //BuildTreeHelper( model, i, n) ;        
-        i = model->GetNextSibling( i );
+        if( model->IsContainer( children[index] ) )
+        {
+            wxDataViewTreeNode * n = new wxDataViewTreeNode( node );
+            n->SetItem(children[index]);
+            n->SetHasChildren( true ) ;
+            node->AddNode( n );
+        }
+        else
+        {
+            node->AddLeaf( children[index].GetID() );
+        }
+        index ++;

     }
     }

+    node->SetSubTreeCount( num );
+    wxDataViewTreeNode * n = node->GetParent();
+    if( n != NULL)
+        n->ChangeSubTreeCount(num);
+

 }
 
 void wxDataViewMainWindow::BuildTree(wxDataViewModel * model)
 {
 }
 
 void wxDataViewMainWindow::BuildTree(wxDataViewModel * model)
 {

+    DestroyTree();
+
+    if (GetOwner()->GetModel()->IsIndexListModel())
+    {
+        m_count = -1 ;
+        return;
+    }
+
+    m_root = new wxDataViewTreeNode( NULL );
+    m_root->SetHasChildren(true);
+

     //First we define a invalid item to fetch the top-level elements
     wxDataViewItem item;
     //First we define a invalid item to fetch the top-level elements
     wxDataViewItem item;

+    SortPrepare();

     BuildTreeHelper( model, item, m_root);
     m_count = -1 ;
 }
 
 void DestroyTreeHelper( wxDataViewTreeNode * node )
 {
     BuildTreeHelper( model, item, m_root);
     m_count = -1 ;
 }
 
 void DestroyTreeHelper( wxDataViewTreeNode * node )
 {

-    if( node->HasChildren() )
+    if( node->GetNodeNumber() != 0 )

     {
     {

-        int len = node->GetChildrenNumber();
+        int len = node->GetNodeNumber();

         int i = 0 ;
         int i = 0 ;

-        wxDataViewTreeNodes nodes = node->GetChildren();
+        wxDataViewTreeNodes nodes = node->GetNodes();

         for( ; i < len; i ++ )
         {
             DestroyTreeHelper(nodes[i]);
         for( ; i < len; i ++ )
         {
             DestroyTreeHelper(nodes[i]);


@@ -2586,8 +3316,12 @@ void DestroyTreeHelper( wxDataViewTreeNode * node )
 
 void wxDataViewMainWindow::DestroyTree()
 {
 
 void wxDataViewMainWindow::DestroyTree()
 {

-    DestroyTreeHelper(m_root);
-    m_count = 0 ;
+    if (m_root)
+    {
+        DestroyTreeHelper(m_root);
+        m_count = 0;
+        m_root = NULL;
+    }

 }
 
 void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
 }
 
 void wxDataViewMainWindow::OnChar( wxKeyEvent &event )


@@ -2616,6 +3350,20 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
 
     switch ( event.GetKeyCode() )
     {
 
     switch ( event.GetKeyCode() )
     {

+        case WXK_RETURN:
+        {
+            if (m_currentRow > 0)
+            {
+                wxWindow *parent = GetParent();
+                wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, parent->GetId());
+                le.SetItem( GetItemByRow(m_currentRow) );
+                le.SetEventObject(parent);
+                le.SetModel(GetOwner()->GetModel());
+
+                parent->GetEventHandler()->ProcessEvent(le);
+            }
+            break;
+        }

         case WXK_UP:
             if ( m_currentRow > 0 )
                 OnArrowChar( m_currentRow - 1, event );
         case WXK_UP:
             if ( m_currentRow > 0 )
                 OnArrowChar( m_currentRow - 1, event );


@@ -2627,11 +3375,11 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
             break;
         //Add the process for tree expanding/collapsing
         case WXK_LEFT:
             break;
         //Add the process for tree expanding/collapsing
         case WXK_LEFT:

-            OnCollapsing(m_currentRow);
-            break;
-        case WXK_RIGHT:
-            OnExpanding( m_currentRow);
-            break;
+         OnCollapsing(m_currentRow);
+         break;
+     case WXK_RIGHT:
+         OnExpanding( m_currentRow);
+         break;

         case WXK_END:
             if (!IsEmpty())
                 OnArrowChar( GetRowCount() - 1, event );
         case WXK_END:
             if (!IsEmpty())
                 OnArrowChar( GetRowCount() - 1, event );


@@ -2682,7 +3430,6 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
     int x = event.GetX();
     int y = event.GetY();
     m_owner->CalcUnscrolledPosition( x, y, &x, &y );
     int x = event.GetX();
     int y = event.GetY();
     m_owner->CalcUnscrolledPosition( x, y, &x, &y );

-

     wxDataViewColumn *col = NULL;
 
     int xpos = 0;
     wxDataViewColumn *col = NULL;
 
     int xpos = 0;


@@ -2703,16 +3450,55 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
     }
     if (!col)
         return;
     }
     if (!col)
         return;

-    wxDataViewRenderer *cell = col->GetRenderer();

 
 

+    wxDataViewRenderer *cell = col->GetRenderer();

     unsigned int current = y / m_lineHeight;
     unsigned int current = y / m_lineHeight;

-

     if ((current > GetRowCount()) || (x > GetEndOfLastCol()))
     {
         // Unselect all if below the last row ?
         return;
     }
 
     if ((current > GetRowCount()) || (x > GetEndOfLastCol()))
     {
         // Unselect all if below the last row ?
         return;
     }
 

+    //Test whether the mouse is hovered on the tree item button
+    bool hover = false;
+    if ((m_root) && (GetOwner()->GetExpanderColumn() == col))
+    {
+        wxDataViewTreeNode * node = GetTreeNodeByRow(current);
+        if( node!=NULL && node->HasChildren() )
+        {
+            int indent = node->GetIndentLevel();
+            indent = GetOwner()->GetIndent()*indent;
+            wxRect rect( xpos + indent + EXPANDER_MARGIN, current * m_lineHeight + EXPANDER_MARGIN, m_lineHeight-2*EXPANDER_MARGIN,m_lineHeight-2*EXPANDER_MARGIN);
+            if( rect.Contains( x, y) )
+            {
+                //So the mouse is over the expander
+                hover = true;
+                if (m_underMouse && m_underMouse != node)
+                {
+                    //wxLogMessage("Undo the row: %d", GetRowByItem(m_underMouse->GetItem()));
+                    RefreshRow(GetRowByItem(m_underMouse->GetItem()));
+                }
+                if (m_underMouse != node)
+                {
+                    //wxLogMessage("Do the row: %d", current);
+                    RefreshRow(current);
+                }
+                m_underMouse = node;
+            }
+        }
+        if (node!=NULL && !node->HasChildren())
+            delete node;
+    }
+    if (!hover)
+    {
+        if (m_underMouse != NULL)
+        {
+            //wxLogMessage("Undo the row: %d", GetRowByItem(m_underMouse->GetItem()));
+            RefreshRow(GetRowByItem(m_underMouse->GetItem()));
+            m_underMouse = NULL;
+        }
+    }
+

     wxDataViewModel *model = GetOwner()->GetModel();
 
     if (event.Dragging())
     wxDataViewModel *model = GetOwner()->GetModel();
 
     if (event.Dragging())


@@ -2749,19 +3535,35 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
         m_lastOnSame = false;
     }
 
         m_lastOnSame = false;
     }
 

+    wxDataViewItem item = GetItemByRow(current);
+    bool ignore_other_columns =
+        ((GetOwner()->GetExpanderColumn() != col) &&
+         (model->IsContainer(item)) &&
+         (!model->HasContainerColumns(item)));
+

     if (event.LeftDClick())
     {
         if ( current == m_lineLastClicked )
         {
     if (event.LeftDClick())
     {
         if ( current == m_lineLastClicked )
         {

-            if (cell->GetMode() == wxDATAVIEW_CELL_ACTIVATABLE)
+            if ((!ignore_other_columns) && (cell->GetMode() == wxDATAVIEW_CELL_ACTIVATABLE))

             {
             {

-                wxDataViewItem item = GetItemByRow(current);

                 wxVariant value;
                 model->GetValue( value, item, col->GetModelColumn() );
                 cell->SetValue( value );
                 wxRect cell_rect( xpos, current * m_lineHeight,
                                   col->GetWidth(), m_lineHeight );
                 cell->Activate( cell_rect, model, item, col->GetModelColumn() );
                 wxVariant value;
                 model->GetValue( value, item, col->GetModelColumn() );
                 cell->SetValue( value );
                 wxRect cell_rect( xpos, current * m_lineHeight,
                                   col->GetWidth(), m_lineHeight );
                 cell->Activate( cell_rect, model, item, col->GetModelColumn() );

+
+            }
+            else
+            {
+                wxWindow *parent = GetParent();
+                wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, parent->GetId());
+                le.SetItem( item );
+                le.SetEventObject(parent);
+                le.SetModel(GetOwner()->GetModel());
+
+                parent->GetEventHandler()->ProcessEvent(le);

             }
             return;
         }
             }
             return;
         }


@@ -2784,24 +3586,26 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
 
         //Process the event of user clicking the expander
         bool expander = false;
 
         //Process the event of user clicking the expander
         bool expander = false;

-        wxDataViewTreeNode * node = GetTreeNodeByRow(current);
-        if( node!=NULL && node->HasChildren() )
+        if ((m_root) && (GetOwner()->GetExpanderColumn() == col))

         {
         {

-            int indent = node->GetIndentLevel();
-            indent = GetOwner()->GetIndent()*indent;
-            wxRect rect( xpos + indent + EXPANDER_MARGIN, current * m_lineHeight + EXPANDER_MARGIN, m_lineHeight-2*EXPANDER_MARGIN,m_lineHeight-2*EXPANDER_MARGIN);
-            if( rect.Contains( x, y) )
+            wxDataViewTreeNode * node = GetTreeNodeByRow(current);
+            if( node!=NULL && node->HasChildren() )

             {
             {

-                expander = true;
-                if( node->IsOpen() )
-                    OnCollapsing(current);
-                else
-                    OnExpanding( current );
+                int indent = node->GetIndentLevel();
+                indent = GetOwner()->GetIndent()*indent;
+                wxRect rect( xpos + indent + EXPANDER_MARGIN, current * m_lineHeight + EXPANDER_MARGIN, m_lineHeight-2*EXPANDER_MARGIN,m_lineHeight-2*EXPANDER_MARGIN);
+                if( rect.Contains( x, y) )
+                {
+                    expander = true;
+                    if( node->IsOpen() )
+                        OnCollapsing(current);
+                    else
+                        OnExpanding( current );
+                }

             }
         }
             }
         }

-

         //If the user click the expander, we do not do editing even if the column with expander are editable
         //If the user click the expander, we do not do editing even if the column with expander are editable

-        if (m_lastOnSame && !expander )
+        if (m_lastOnSame && !expander && !ignore_other_columns)

         {
             if ((col == m_currentCol) && (current == m_currentRow) &&
                 (cell->GetMode() == wxDATAVIEW_CELL_EDITABLE) )
         {
             if ((col == m_currentCol) && (current == m_currentRow) &&
                 (cell->GetMode() == wxDATAVIEW_CELL_EDITABLE) )


@@ -2834,6 +3638,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
             SelectAllRows(false);
             ChangeCurrentRow(current);
             SelectRow(m_currentRow,true);
             SelectAllRows(false);
             ChangeCurrentRow(current);
             SelectRow(m_currentRow,true);

+            SendSelectionChangedEvent(GetItemByRow( m_currentRow ) );

         }
 
         // notify cell about right click
         }
 
         // notify cell about right click


@@ -2849,9 +3654,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
     }
     if (event.LeftDown() || forceClick)
     {
     }
     if (event.LeftDown() || forceClick)
     {

-#ifdef __WXMSW__

         SetFocus();
         SetFocus();

-#endif

 
         m_lineBeforeLastClicked = m_lineLastClicked;
         m_lineLastClicked = current;
 
         m_lineBeforeLastClicked = m_lineLastClicked;
         m_lineLastClicked = current;


@@ -2865,10 +3668,9 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
             if ( IsSingleSel() || !IsRowSelected(current) )
             {
                 SelectAllRows( false );
             if ( IsSingleSel() || !IsRowSelected(current) )
             {
                 SelectAllRows( false );

-

                 ChangeCurrentRow(current);
                 ChangeCurrentRow(current);

-

                 SelectRow(m_currentRow,true);
                 SelectRow(m_currentRow,true);

+                SendSelectionChangedEvent(GetItemByRow( m_currentRow ) );

             }
             else // multi sel & current is highlighted & no mod keys
             {
             }
             else // multi sel & current is highlighted & no mod keys
             {


@@ -2881,8 +3683,8 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
             if (cmdModifierDown)
             {
                 ChangeCurrentRow(current);
             if (cmdModifierDown)
             {
                 ChangeCurrentRow(current);

-

                 ReverseRowSelection(m_currentRow);
                 ReverseRowSelection(m_currentRow);

+                SendSelectionChangedEvent(GetItemByRow(m_selection[0]) );

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


@@ -2898,6 +3700,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
                 }
 
                 SelectRows(lineFrom, lineTo, true);
                 }
 
                 SelectRows(lineFrom, lineTo, true);

+                SendSelectionChangedEvent(GetItemByRow(m_selection[0]) );

             }
             else // !ctrl, !shift
             {
             }
             else // !ctrl, !shift
             {


@@ -2939,16 +3742,18 @@ void wxDataViewMainWindow::OnKillFocus( wxFocusEvent &event )
     event.Skip();
 }
 
     event.Skip();
 }
 

-wxDataViewItem wxDataViewMainWindow::GetSelection()
+wxDataViewItem wxDataViewMainWindow::GetSelection() const

 {
     if( m_selection.GetCount() != 1 )
         return wxDataViewItem();
 {
     if( m_selection.GetCount() != 1 )
         return wxDataViewItem();

-    return GetItemByRow( m_selection.Item( 0 ) );
+
+    return GetItemByRow( m_selection.Item(0));

 }
 
 //-----------------------------------------------------------------------------
 // wxDataViewCtrl
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------
 // wxDataViewCtrl
 //-----------------------------------------------------------------------------

+WX_DEFINE_LIST(wxDataViewColumnList)

 
 IMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl, wxDataViewCtrlBase)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl, wxDataViewCtrlBase)
 


@@ -2972,9 +3777,11 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
            long style, const wxValidator& validator )
 {
     if (!wxControl::Create( parent, id, pos, size,
            long style, const wxValidator& validator )
 {
     if (!wxControl::Create( parent, id, pos, size,

-                            style | wxScrolledWindowStyle|wxSUNKEN_BORDER, validator))
+                            style | wxScrolledWindowStyle|wxBORDER_SUNKEN, validator))

         return false;
 
         return false;
 

+    SetInitialSize(size);
+

     Init();
 
 #ifdef __WXMAC__
     Init();
 
 #ifdef __WXMAC__


@@ -3041,6 +3848,8 @@ bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model )
 
     model->AddNotifier( m_notifier );
 
 
     model->AddNotifier( m_notifier );
 

+    m_clientArea->DestroyTree();
+    

     m_clientArea->BuildTree(model);
 
     m_clientArea->UpdateDisplay();
     m_clientArea->BuildTree(model);
 
     m_clientArea->UpdateDisplay();


@@ -3053,6 +3862,17 @@ bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col )
     if (!wxDataViewCtrlBase::AppendColumn(col))
         return false;
 
     if (!wxDataViewCtrlBase::AppendColumn(col))
         return false;
 

+    m_cols.Append( col );
+    OnColumnChange();
+    return true;
+}
+
+bool wxDataViewCtrl::PrependColumn( wxDataViewColumn *col )
+{
+    if (!wxDataViewCtrlBase::PrependColumn(col))
+        return false;
+
+    m_cols.Insert( col );

     OnColumnChange();
     return true;
 }
     OnColumnChange();
     return true;
 }


@@ -3075,54 +3895,284 @@ void wxDataViewCtrl::DoSetIndent()
     m_clientArea->UpdateDisplay();
 }
 
     m_clientArea->UpdateDisplay();
 }
 

-wxDataViewItem wxDataViewCtrl::GetSelection() 
+unsigned int wxDataViewCtrl::GetColumnCount() const
+{
+    return m_cols.GetCount();
+}
+
+wxDataViewColumn* wxDataViewCtrl::GetColumn( unsigned int pos ) const
+{
+    wxDataViewColumnList::const_iterator iter;
+    unsigned int i = 0;
+    for (iter = m_cols.begin(); iter!=m_cols.end(); iter++)
+    {
+        if (i == pos)
+            return *iter;
+
+        if ((*iter)->IsHidden())
+            continue;
+        i ++;
+    }
+    return NULL;
+}
+
+bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column )
+{
+    wxDataViewColumnList::compatibility_iterator  ret = m_cols.Find( column );
+    if (!ret)
+        return false;
+
+    m_cols.Erase(ret);
+    delete column;
+    OnColumnChange();
+
+    return true;
+}
+
+bool wxDataViewCtrl::ClearColumns()
+{
+    m_cols.clear();
+    OnColumnChange();
+    return true;
+}
+
+int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const
+{
+    int ret = 0, dead = 0;
+    int len = GetColumnCount();
+    for (int i=0; i<len; i++)
+    {
+        wxDataViewColumn * col = GetColumn(i);
+        if (col->IsHidden())
+            continue;
+        ret += col->GetWidth();
+        if (column==col)
+        {
+            CalcScrolledPosition( ret, dead, &ret, &dead );
+            break;
+        }
+    }
+    return ret;
+}
+
+wxDataViewColumn *wxDataViewCtrl::GetSortingColumn() const
+{
+    return NULL;
+}
+
+//Selection code with wxDataViewItem as parameters
+wxDataViewItem wxDataViewCtrl::GetSelection() const

 {
     return m_clientArea->GetSelection();
 }
 
 {
     return m_clientArea->GetSelection();
 }
 

-/********************************************************************
-void wxDataViewCtrl::SetSelection( int row )
+int wxDataViewCtrl::GetSelections( wxDataViewItemArray & sel ) const
+{
+    sel.Empty();
+    wxDataViewSelection selection = m_clientArea->GetSelections();
+    int len = selection.GetCount();
+    for( int i = 0; i < len; i ++)
+    {
+        unsigned int row = selection[i];
+        sel.Add( m_clientArea->GetItemByRow( row ) );
+    }
+    return len;
+}
+
+void wxDataViewCtrl::SetSelections( const wxDataViewItemArray & sel )
+{
+    wxDataViewSelection selection(wxDataViewSelectionCmp) ;
+    int len = sel.GetCount();
+    for( int i = 0; i < len; i ++ )
+    {
+        int row = m_clientArea->GetRowByItem( sel[i] );
+        if( row >= 0 )
+            selection.Add( static_cast<unsigned int>(row) );
+    }
+    m_clientArea->SetSelections( selection );
+}
+
+void wxDataViewCtrl::Select( const wxDataViewItem & item )
+{
+    int row = m_clientArea->GetRowByItem( item );
+    if( row >= 0 )
+    {
+        //Unselect all rows before select another in the single select mode
+        if (m_clientArea->IsSingleSel())
+            m_clientArea->SelectAllRows(false);
+        m_clientArea->SelectRow(row, true);
+    }
+}
+
+void wxDataViewCtrl::Unselect( const wxDataViewItem & item )

 {
 {

-    m_clientArea->SelectRow(row, true);
+    int row = m_clientArea->GetRowByItem( item );
+    if( row >= 0 )
+        m_clientArea->SelectRow(row, false);

 }
 
 }
 

-void wxDataViewCtrl::SetSelectionRange( unsigned int from, unsigned int to )
+bool wxDataViewCtrl::IsSelected( const wxDataViewItem & item ) const

 {
 {

-    m_clientArea->SelectRows(from, to, true);
+    int row = m_clientArea->GetRowByItem( item );
+    if( row >= 0 )
+    {
+        return m_clientArea->IsRowSelected(row);
+    }
+    return false;

 }
 
 }
 

-void wxDataViewCtrl::SetSelections( const wxArrayInt& aSelections )
+//Selection code with row number as parameter
+int wxDataViewCtrl::GetSelections( wxArrayInt & sel ) const

 {
 {

-    m_clientArea->Select(aSelections);
+    sel.Empty();
+    wxDataViewSelection selection = m_clientArea->GetSelections();
+    int len = selection.GetCount();
+    for( int i = 0; i < len; i ++)
+    {
+        unsigned int row = selection[i];
+        sel.Add( row );
+    }
+    return len;

 }
 
 }
 

-void wxDataViewCtrl::Unselect( unsigned int WXUNUSED(row) )
+void wxDataViewCtrl::SetSelections( const wxArrayInt & sel )

 {
 {

-    // FIXME - TODO
+    wxDataViewSelection selection(wxDataViewSelectionCmp) ;
+    int len = sel.GetCount();
+    for( int i = 0; i < len; i ++ )
+    {
+        int row = sel[i];
+        if( row >= 0 )
+            selection.Add( static_cast<unsigned int>(row) );
+    }
+    m_clientArea->SetSelections( selection );

 }
 
 }
 

-bool wxDataViewCtrl::IsSelected( unsigned int WXUNUSED(row) ) const
+void wxDataViewCtrl::Select( int row )

 {
 {

-    // FIXME - TODO
+    if( row >= 0 )
+    {
+        if (m_clientArea->IsSingleSel())
+            m_clientArea->SelectAllRows(false);
+        m_clientArea->SelectRow( row, true );
+    }
+}
+
+void wxDataViewCtrl::Unselect( int row )
+{
+    if( row >= 0 )
+        m_clientArea->SelectRow(row, false);
+}

 
 

+bool wxDataViewCtrl::IsSelected( int row ) const
+{
+    if( row >= 0 )
+        return m_clientArea->IsRowSelected(row);

     return false;
 }
 
     return false;
 }
 

-int wxDataViewCtrl::GetSelection() const
+void wxDataViewCtrl::SelectRange( int from, int to )

 {
 {

-    // FIXME - TODO
+    wxArrayInt sel;
+    for( int i = from; i < to; i ++ )
+        sel.Add( i );
+    m_clientArea->Select(sel);
+}

 
 

-    return -1;
+void wxDataViewCtrl::UnselectRange( int from, int to )
+{
+    wxDataViewSelection sel = m_clientArea->GetSelections();
+    for( int i = from; i < to; i ++ )
+        if( sel.Index( i ) != wxNOT_FOUND )
+            sel.Remove( i );
+    m_clientArea->SetSelections(sel);

 }
 
 }
 

-int wxDataViewCtrl::GetSelections(wxArrayInt& WXUNUSED(aSelections) ) const
+void wxDataViewCtrl::SelectAll()

 {
 {

-    // FIXME - TODO
+    m_clientArea->SelectAllRows(true);
+}

 
 

-    return 0;
+void wxDataViewCtrl::UnselectAll()
+{
+    m_clientArea->SelectAllRows(false);

 }
 }

-*********************************************************************/
-#endif
+
+void wxDataViewCtrl::EnsureVisible( int row, int column )
+{
+    if( row < 0 )
+        row = 0;
+    if( row > (int) m_clientArea->GetRowCount() )
+        row = m_clientArea->GetRowCount();
+
+    int first = m_clientArea->GetFirstVisibleRow();
+    int last = m_clientArea->GetLastVisibleRow();
+    if( row < first )
+        m_clientArea->ScrollTo( row, column );
+    else if( row > last )
+        m_clientArea->ScrollTo( row - last + first, column );
+    else
+        m_clientArea->ScrollTo( first, column );
+}
+
+void wxDataViewCtrl::EnsureVisible( const wxDataViewItem & item, const wxDataViewColumn * column )
+{
+    int row = m_clientArea->GetRowByItem(item);
+    if( row >= 0 )
+    {
+        if( column == NULL )
+            EnsureVisible(row, -1);
+        else
+        {
+            int col = 0;
+            int len = GetColumnCount();
+            for( int i = 0; i < len; i ++ )
+                if( GetColumn(i) == column )
+                {
+                    col = i;
+                    break;
+                }
+            EnsureVisible( row, col );
+        }
+    }
+
+}
+
+void wxDataViewCtrl::HitTest( const wxPoint & point, wxDataViewItem & item, wxDataViewColumn* &column ) const
+{
+    m_clientArea->HitTest(point, item, column);
+}
+
+wxRect wxDataViewCtrl::GetItemRect( const wxDataViewItem & item, const wxDataViewColumn* column ) const
+{
+    return m_clientArea->GetItemRect(item, column);
+}
+
+wxDataViewItem wxDataViewCtrl::GetItemByRow( unsigned int row ) const
+{
+    return m_clientArea->GetItemByRow( row );
+}
+
+int wxDataViewCtrl::GetRowByItem( const wxDataViewItem & item ) const
+{
+    return m_clientArea->GetRowByItem( item );
+}
+
+void wxDataViewCtrl::Expand( const wxDataViewItem & item )
+{
+    int row = m_clientArea->GetRowByItem( item );
+    if (row != -1)
+        m_clientArea->Expand(row);
+}
+
+void wxDataViewCtrl::Collapse( const wxDataViewItem & item )
+{
+    int row = m_clientArea->GetRowByItem( item );
+    if (row != -1)
+        m_clientArea->Collapse(row);
+}
+
+ #endif

     // !wxUSE_GENERICDATAVIEWCTRL
 
 #endif
     // !wxUSE_GENERICDATAVIEWCTRL
 
 #endif