X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9bcc8016c1af6f55c31a1180180cee9a949794ce..82c126e50158efee5a1f46e1200be380c5199f8d:/src/generic/datavgen.cpp?ds=sidebyside

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 7be633d8c6..57d8ae6d58 100644
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -56,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 top/bottom
-static const int PADDING_TOPBOTTOM = 1;
-
 // the expander space margin
 static const int EXPANDER_MARGIN = 4;
 
@@ -66,7 +63,7 @@ static const int EXPANDER_MARGIN = 4;
 // wxDataViewHeaderWindow
 //-----------------------------------------------------------------------------
 
-#define USE_NATIVE_HEADER_WINDOW    0
+#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
@@ -141,17 +138,23 @@ public:
     // 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 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)); }
+        
+    int m_scrollOffsetX;
+    int m_buttonHeight;
 
 private:
     DECLARE_DYNAMIC_CLASS(wxDataViewHeaderWindowMSW)
@@ -204,6 +207,7 @@ protected:
     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
@@ -224,6 +228,7 @@ protected:
         m_isDragging = false;
         m_dirty = false;
 
+        m_hover = wxNOT_FOUND;
         m_column = wxNOT_FOUND;
         m_currentX = 0;
         m_minX = 0;
@@ -232,7 +237,6 @@ protected:
         m_penCurrent = wxPen(col, 1, wxSOLID);
     }
 
-    void DrawCurrent();
     void AdjustDC(wxDC& dc);
 
 private:
@@ -270,118 +274,116 @@ class wxDataViewTreeNode
 {
 public:
     wxDataViewTreeNode( wxDataViewTreeNode * parent = NULL )
-        { this->parent = parent;
-          if( parent == NULL )
-              open = true;
-       else
-        open = false;
-          hasChildren = false;
-          subTreeCount  = 0;
-    }
-    //I don't know what I need to do in the destructure
-    ~wxDataViewTreeNode()
     {
+        m_parent = parent;
+        if (!parent)
+            m_open = true;
+        else
+            m_open = false;
+        m_hasChildren = false;
+        m_subTreeCount  = 0;
+    }
 
+    ~wxDataViewTreeNode()
+    {
     }
 
-    wxDataViewTreeNode * GetParent() { return parent; }
-    void SetParent( wxDataViewTreeNode * parent ) { this->parent = parent; }
-    wxDataViewTreeNodes &  GetNodes() { return nodes; }
-    wxDataViewTreeLeaves & GetChildren() { return leaves; }
+    wxDataViewTreeNode * GetParent() { return m_parent; }
+    void SetParent( wxDataViewTreeNode * parent ) { m_parent = parent; }
+    wxDataViewTreeNodes &  GetNodes() { return m_nodes; }
+    wxDataViewTreeLeaves & GetChildren() { return m_leaves; }
 
     void AddNode( wxDataViewTreeNode * node )
     {
-        leaves.Add( node->GetItem().GetID() );
+        m_leaves.Add( node->GetItem().GetID() );
         if (g_column >= -1)
-            leaves.Sort( &wxGenericTreeModelItemCmp );
-        nodes.Add( node );
+            m_leaves.Sort( &wxGenericTreeModelItemCmp );
+        m_nodes.Add( node );
         if (g_column >= -1)
-            nodes.Sort( &wxGenericTreeModelNodeCmp );
+            m_nodes.Sort( &wxGenericTreeModelNodeCmp );
     }
     void AddLeaf( void * leaf )
     {
-        leaves.Add( leaf );
+        m_leaves.Add( leaf );
         if (g_column >= -1)
-            leaves.Sort( &wxGenericTreeModelItemCmp );
+            m_leaves.Sort( &wxGenericTreeModelItemCmp );
     }
 
-    wxDataViewItem & GetItem() { return item; }
-    void SetItem( const wxDataViewItem & item ) { this->item = item; }
+    wxDataViewItem & GetItem() { return m_item; }
+    void SetItem( const wxDataViewItem & item ) { m_item = item; }
 
-    unsigned int GetChildrenNumber() { return leaves.GetCount(); }
-    unsigned int GetNodeNumber() { return nodes.GetCount(); }
+    unsigned int GetChildrenNumber() { return m_leaves.GetCount(); }
+    unsigned int GetNodeNumber() { return m_nodes.GetCount(); }
     int GetIndentLevel()
     {
         int ret = 0 ;
-     wxDataViewTreeNode * node = this;
-     while( node->GetParent()->GetParent() != NULL )
-     {
-         node = node->GetParent();
-         ret ++;
-     }
-     return ret;
+        wxDataViewTreeNode * node = this;
+        while( node->GetParent()->GetParent() != NULL )
+        {
+            node = node->GetParent();
+            ret ++;
+        }
+        return ret;
     }
 
     bool IsOpen()
     {
-        return open ;
+        return m_open ;
     }
 
     void ToggleOpen()
     {
-        int len = nodes.GetCount();
+        int len = m_nodes.GetCount();
         int sum = 0;
         for ( int i = 0 ;i < len ; i ++)
-            sum += nodes[i]->GetSubTreeCount();
+            sum += m_nodes[i]->GetSubTreeCount();
 
-        sum += leaves.GetCount();
-        if( open )
+        sum += m_leaves.GetCount();
+        if (m_open)
         {
             ChangeSubTreeCount(-sum);
-            open = !open;
+            m_open = !m_open;
         }
         else
         {
-            open = !open;
+            m_open = !m_open;
             ChangeSubTreeCount(sum);
         }
     }
-    bool HasChildren() { return hasChildren; }
-    void SetHasChildren( bool has ){ hasChildren = has; }
+    bool HasChildren() { return m_hasChildren; }
+    void SetHasChildren( bool has ){ m_hasChildren = has; }
 
-    void SetSubTreeCount( int num ) { subTreeCount = num; }
-    int GetSubTreeCount() { return subTreeCount; }
+    void SetSubTreeCount( int num ) { m_subTreeCount = num; }
+    int GetSubTreeCount() { return m_subTreeCount; }
     void ChangeSubTreeCount( int num )
     {
-        if( !open )
+        if( !m_open )
             return ;
-        subTreeCount += num;
-        if( parent )
-            parent->ChangeSubTreeCount(num);
+        m_subTreeCount += num;
+        if( m_parent )
+            m_parent->ChangeSubTreeCount(num);
     }
 
     void Resort()
     {
         if (g_column >= -1)
         {
-            nodes.Sort( &wxGenericTreeModelNodeCmp );
-            int len = nodes.GetCount();
+            m_nodes.Sort( &wxGenericTreeModelNodeCmp );
+            int len = m_nodes.GetCount();
             for (int i = 0; i < len; i ++)
-            {
-                nodes[i]->Resort();
-            }
-            leaves.Sort( &wxGenericTreeModelItemCmp );
+                m_nodes[i]->Resort();
+            m_leaves.Sort( &wxGenericTreeModelItemCmp );
         }
     }
 
 private:
-    wxDataViewTreeNode * parent;
-    wxDataViewTreeNodes  nodes;
-    wxDataViewTreeLeaves leaves;
-    wxDataViewItem  item;
-    bool open;
-    bool hasChildren;
-    int subTreeCount;
+    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)
@@ -403,7 +405,7 @@ int LINKAGEMODE wxGenericTreeModelItemCmp( void ** id1, void ** id2)
 WX_DEFINE_SORTED_USER_EXPORTED_ARRAY_SIZE_T(unsigned int, wxDataViewSelection,
                                             WXDLLIMPEXP_ADV);
 WX_DECLARE_LIST(wxDataViewItem, ItemList);
-WX_DEFINE_LIST(ItemList);
+WX_DEFINE_LIST(ItemList)
 
 class wxDataViewMainWindow: public wxWindow
 {
@@ -416,7 +418,6 @@ public:
     virtual ~wxDataViewMainWindow();
 
     // notifications from wxDataViewModel
-    void SendModelEvent( wxEventType type, const wxDataViewItem & item);
     bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item );
     bool ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item );
     bool ItemChanged( const wxDataViewItem &item );
@@ -424,8 +425,11 @@ public:
     bool Cleared();
     void Resort()
     {
-        SortPrepare();
-        m_root->Resort();
+        if (m_root)
+        {
+            SortPrepare();
+            m_root->Resort();
+        }
         UpdateDisplay();
     }
 
@@ -489,6 +493,7 @@ public:
     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 );
@@ -500,7 +505,6 @@ public:
         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
@@ -606,6 +610,8 @@ wxDataViewRenderer::wxDataViewRenderer( const wxString &varianttype,
     m_dc = NULL;
     m_align = align;
     m_mode = mode;
+    m_wantsAttr = false;
+    m_hasAttr = false;
 }
 
 wxDataViewRenderer::~wxDataViewRenderer()
@@ -640,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
 // ---------------------------------------------------------
@@ -686,14 +702,7 @@ bool wxDataViewTextRenderer::GetValueFromEditorCtrl( wxControl *editor, wxVarian
 
 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;
 }
 
@@ -709,6 +718,60 @@ wxSize wxDataViewTextRenderer::GetSize() const
     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
 // ---------------------------------------------------------
@@ -954,12 +1017,10 @@ bool wxDataViewDateRenderer::GetValue( wxVariant &value ) const
     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();
-    dc->DrawText( tmp, cell.x, cell.y );
-
+    RenderText( tmp, 0, cell, dc, state );
     return true;
 }
 
@@ -1016,38 +1077,52 @@ bool wxDataViewIconTextRenderer::SetValue( const wxVariant &value )
     return true;
 }
 
-bool wxDataViewIconTextRenderer::GetValue( wxVariant &value ) const
+bool wxDataViewIconTextRenderer::GetValue( wxVariant& WXUNUSED(value) ) const
 {
     return false;
 }
 
 bool wxDataViewIconTextRenderer::Render( wxRect cell, wxDC *dc, int state )
 {
-    dc->SetFont( GetOwner()->GetOwner()->GetFont() );
-
+    int xoffset = 0;
     const wxIcon &icon = m_value.GetIcon();
     if (icon.IsOk())
     {
-        dc->DrawIcon( icon, cell.x, cell.y ); // TODO centre
-        cell.x += icon.GetWidth()+4;
+        dc->DrawIcon( icon, cell.x, cell.y + ((cell.height - icon.GetHeight()) / 2));
+        xoffset =  icon.GetWidth()+4;
     }
 
-    dc->DrawText( m_value.GetText(), cell.x, cell.y );
+    RenderText( m_value.GetText(), xoffset, cell, dc, state );
 
     return true;
 }
 
 wxSize wxDataViewIconTextRenderer::GetSize() const
 {
-    return wxSize(80,16);  // TODO
+    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 *parent, wxRect labelRect, const wxVariant &value )
+wxControl *
+wxDataViewIconTextRenderer::CreateEditorCtrl(wxWindow * WXUNUSED(parent),
+                                             wxRect WXUNUSED(labelRect),
+                                             const wxVariant& WXUNUSED(value))
 {
     return NULL;
 }
 
-bool wxDataViewIconTextRenderer::GetValueFromEditorCtrl( wxControl* editor, wxVariant &value )
+bool
+wxDataViewIconTextRenderer::GetValueFromEditorCtrl(wxControl* WXUNUSED(editor),
+                                                   wxVariant& WXUNUSED(value))
 {
     return false;
 }
@@ -1177,6 +1252,13 @@ void wxDataViewHeaderWindowBase::SendEvent(wxEventType type, unsigned int n)
 
 #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);
 
@@ -1188,17 +1270,24 @@ bool wxDataViewHeaderWindowMSW::Create( wxDataViewCtrl *parent, wxWindowID id,
 {
     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,
-        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();
-    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,
@@ -1221,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());
-
-    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;
 }
 
@@ -1260,6 +1319,11 @@ wxDataViewHeaderWindowMSW::~wxDataViewHeaderWindow()
     UnsubclassWin();
 }
 
+wxSize wxDataViewHeaderWindowMSW::DoGetBestSize() const
+{
+    return wxSize(80, m_buttonHeight );
+}
+
 void wxDataViewHeaderWindowMSW::UpdateDisplay()
 {
     // remove old columns
@@ -1269,7 +1333,6 @@ void wxDataViewHeaderWindowMSW::UpdateDisplay()
     // add the updated array of columns to the header control
     unsigned int cols = GetOwner()->GetColumnCount();
     unsigned int added = 0;
-    wxDataViewModel * model = GetOwner()->GetModel();
     for (unsigned int i = 0; i < cols; i++)
     {
         wxDataViewColumn *col = GetColumn( i );
@@ -1284,13 +1347,12 @@ void wxDataViewHeaderWindowMSW::UpdateDisplay()
         hdi.fmt = HDF_LEFT | HDF_STRING;
         //hdi.fmt &= ~(HDF_SORTDOWN|HDF_SORTUP);
 
-        //sorting support
-        if(model && m_owner->GetSortingColumn() == col)
+        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
-            //hdi.fmt |= model->GetSortOrderAscending()? HDF_SORTUP:HDF_SORTDOWN;
-            ;
+            // VZ: works with 5.81
+            hdi.fmt |= col->IsSortOrderAscending() ? HDF_SORTUP : HDF_SORTDOWN;
         }
 
         // lParam is reserved for application's use:
@@ -1320,7 +1382,7 @@ void wxDataViewHeaderWindowMSW::UpdateDisplay()
 
         default:
             // such alignment is not allowed for the column header!
-            wxFAIL;
+            break; // wxFAIL;
         }
 
         SendMessage((HWND)m_hWnd, HDM_INSERTITEM,
@@ -1495,32 +1557,20 @@ bool wxDataViewHeaderWindowMSW::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARA
     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__)
@@ -1599,13 +1649,23 @@ void wxGenericDataViewHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
                 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),
-                                    m_parent->IsEnabled() ? 0
-                                                          : (int)wxCONTROL_DISABLED,
+                                    state,
                                     sortArrow
                                 );
 
@@ -1617,13 +1677,14 @@ void wxGenericDataViewHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         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_RIGHT:
-            x += cw - titleSz.GetWidth() - HEADER_HORIZ_BORDER;
-            break;
         }
 
         // always center the title vertically:
@@ -1716,6 +1777,13 @@ void wxGenericDataViewHeaderWindow::OnMouse( wxMouseEvent &event )
             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;
 
@@ -1778,33 +1846,6 @@ void wxGenericDataViewHeaderWindow::OnMouse( wxMouseEvent &event )
     }
 }
 
-//I must say that this function is deprecated, but I think it is useful to keep it for a time
-void wxGenericDataViewHeaderWindow::DrawCurrent()
-{
-#if 1
-    GetColumn(m_column)->SetWidth(m_currentX - m_minX);
-#else
-    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 );
-#endif
-}
-
 void wxGenericDataViewHeaderWindow::AdjustDC(wxDC& dc)
 {
     int xpix, x;
@@ -1860,7 +1901,7 @@ END_EVENT_TABLE()
 
 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 )
 
 {
@@ -1873,14 +1914,7 @@ wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID i
     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);
@@ -2012,25 +2046,12 @@ bool Walker( wxDataViewTreeNode * node, DoJob & func )
     return false;
 }
 
-void wxDataViewMainWindow::SendModelEvent( 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);
-}
-
 bool wxDataViewMainWindow::ItemAdded(const wxDataViewItem & parent, const wxDataViewItem & item)
 {
     SortPrepare();
 
     wxDataViewTreeNode * node;
     node = FindNode(parent);
-    SendModelEvent(wxEVT_COMMAND_DATAVIEW_MODEL_ITEM_ADDED, item );
 
     if( node == NULL )
         return false;
@@ -2117,8 +2138,6 @@ bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
 
     UpdateDisplay();
 
-    SendModelEvent(wxEVT_COMMAND_DATAVIEW_MODEL_ITEM_DELETED, item);
-
     return true;
 }
 
@@ -2127,7 +2146,13 @@ bool wxDataViewMainWindow::ItemChanged(const wxDataViewItem & item)
     SortPrepare();
     g_model->Resort();
 
-    SendModelEvent(wxEVT_COMMAND_DATAVIEW_MODEL_ITEM_CHANGED,item);
+    //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;
 }
@@ -2148,7 +2173,7 @@ bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned i
 
     //Send event
     wxWindow *parent = GetParent();
-    wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_MODEL_VALUE_CHANGED, parent->GetId());
+    wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, parent->GetId());
     le.SetEventObject(parent);
     le.SetModel(GetOwner()->GetModel());
     le.SetItem(item);
@@ -2166,12 +2191,6 @@ bool wxDataViewMainWindow::Cleared()
     DestroyTree();
     UpdateDisplay();
 
-    wxWindow *parent = GetParent();
-    wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_MODEL_CLEARED, parent->GetId());
-    le.SetEventObject(parent);
-    le.SetModel(GetOwner()->GetModel());
-    parent->GetEventHandler()->ProcessEvent(le);
-
     return true;
 }
 
@@ -2226,8 +2245,8 @@ void wxDataViewMainWindow::ScrollTo( int rows, int column )
     if( column != -1 )
     {
         wxRect rect = GetClientRect();
-        unsigned int colnum = 0;
-        unsigned int x_start = 0, x_end = 0, w = 0;
+        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++)
@@ -2392,23 +2411,46 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         {
             // get the cell value and set it into the renderer
             wxVariant value;
-         wxDataViewTreeNode * node = GetTreeNodeByRow(item);
-         if( node == NULL )
-         {
-             continue;
-         }
+            wxDataViewTreeNode *node = NULL;
+            wxDataViewItem dataitem;
+            
+            if (m_root)
+            {
+                node = GetTreeNodeByRow(item);
+                if( node == NULL )
+                    continue;
+
+                dataitem = node->GetItem();
 
-            wxDataViewItem dataitem = node->GetItem();
-             model->GetValue( value, dataitem, col->GetModelColumn());
+                if ((i > 0) && model->IsContainer(dataitem) && !model->HasContainerColumns(dataitem))
+                    continue;
+            }
+            else
+            {
+                dataitem = wxDataViewItem( (void*) item );
+            }
+
+            model->GetValue( value, dataitem, col->GetModelColumn());
             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;
 
             //Draw the expander here.
-            int indent = node->GetIndentLevel();
-            if( col == expander )
+            int indent = 0;
+            if ((m_root) && (col == expander))
             {
+                indent = node->GetIndentLevel();
+                
                 //Calculate the indent first
                 indent = cell_rect.x + GetOwner()->GetIndent() * indent;
 
@@ -2433,9 +2475,11 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
                 }
                 else
                 {
-                     // I am wandering whether we should draw dot lines between tree nodes
-                     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
+                     // 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
@@ -2447,7 +2491,8 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
             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();
@@ -2470,15 +2515,13 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
             // add padding
             item_rect.x += PADDING_RIGHTLEFT;
-            item_rect.y += PADDING_TOPBOTTOM;
             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;
 
             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
@@ -2534,9 +2577,7 @@ unsigned int wxDataViewMainWindow::GetLastVisibleRow()
                                      &client_size.x, &client_size.y );
 
     //we should deal with the pixel here
-    unsigned int row = (client_size.y)/m_lineHeight;
-    if( client_size.y % m_lineHeight < m_lineHeight/2 )
-        row -= 1;
+    unsigned int row = ((client_size.y)/m_lineHeight) - 1;
 
     return wxMin( GetRowCount()-1, row );
 }
@@ -2660,6 +2701,18 @@ bool wxDataViewMainWindow::IsRowSelected( unsigned int row )
     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 );
@@ -2734,6 +2787,8 @@ void wxDataViewMainWindow::OnArrowChar(unsigned int newCurrent, const wxKeyEvent
         }
 
         SelectRows( oldCurrent, newCurrent, true );
+        if (oldCurrent!=newCurrent)
+            SendSelectionChangedEvent(GetItemByRow(m_selection[0]));
     }
     else // !shift
     {
@@ -2746,12 +2801,15 @@ void wxDataViewMainWindow::OnArrowChar(unsigned int newCurrent, const wxKeyEvent
         ChangeCurrentRow( newCurrent );
 
         if ( !event.ControlDown() )
+        {
             SelectRow( m_currentRow, true );
+            SendSelectionChangedEvent(GetItemByRow(m_currentRow));
+        }
         else
             RefreshRow( m_currentRow );
     }
 
-    //EnsureVisible( m_currentRow );
+    GetOwner()->EnsureVisible( m_currentRow, -1 );
 }
 
 wxRect wxDataViewMainWindow::GetLineRect( unsigned int row ) const
@@ -2818,9 +2876,16 @@ private:
 
 wxDataViewItem wxDataViewMainWindow::GetItemByRow(unsigned int row) const
 {
-    RowToItemJob job( row, -2 );
-    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
@@ -2893,9 +2958,16 @@ private:
 
 wxDataViewTreeNode * wxDataViewMainWindow::GetTreeNodeByRow(unsigned int row)
 {
-    RowToTreeNodeJob job( row , -2, m_root );
-    Walker( m_root , job );
-    return job.GetResult();
+    if (!m_root)
+    {
+        return NULL;
+    }
+    else
+    {
+        RowToTreeNodeJob job( row , -2, m_root );
+        Walker( m_root , job );
+        return job.GetResult();
+    }
 }
 
 wxDataViewEvent wxDataViewMainWindow::SendExpanderEvent( wxEventType type, const wxDataViewItem & item )
@@ -2942,6 +3014,7 @@ void wxDataViewMainWindow::OnExpanding( unsigned int row )
                 SelectRow( row, false );
                 SelectRow( row + 1, true );
                 ChangeCurrentRow( row + 1 );
+                SendSelectionChangedEvent( GetItemByRow(row+1));
             }
         }
         else
@@ -2977,6 +3050,7 @@ void wxDataViewMainWindow::OnCollapsing(unsigned int row)
                     SelectRow( row, false);
                     SelectRow(parent , true );
                     ChangeCurrentRow( parent );
+                    SendSelectionChangedEvent( node->GetItem() );
                 }
             }
         }
@@ -3016,7 +3090,7 @@ wxDataViewTreeNode * wxDataViewMainWindow::FindNode( const wxDataViewItem & item
             }
 
             wxDataViewTreeNodes nodes = node->GetNodes();
-            int i = 0;
+            unsigned int i = 0;
             for (; i < nodes.GetCount(); i ++)
             {
                 if (nodes[i]->GetItem() == (**iter))
@@ -3080,7 +3154,15 @@ wxRect wxDataViewMainWindow::GetItemRect( const wxDataViewItem & item, const wxD
 
 int wxDataViewMainWindow::RecalculateCount()
 {
-    return m_root->GetSubTreeCount();
+    if (!m_root)
+    {
+        wxDataViewIndexListModel *list_model = (wxDataViewIndexListModel*) GetOwner()->GetModel();
+        return list_model->GetLastIndex();
+    }
+    else
+    {
+        return m_root->GetSubTreeCount();
+    }
 }
 
 class ItemToRowJob : public DoJob
@@ -3134,26 +3216,33 @@ int wxDataViewMainWindow::GetRowByItem(const wxDataViewItem & item)
     if( model == NULL )
         return -1;
 
-    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() )
+    if (!m_root)
     {
-        pItem = new wxDataViewItem( it );
-        list.Insert( pItem );
-        it = model->GetParent( it );
+        return wxPtrToUInt( item.GetID() );
     }
-    pItem = new wxDataViewItem( );
-    list.Insert( pItem );
+    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();
+        ItemToRowJob job( item, list.begin() );
+        Walker(m_root , job );
+        return job.GetResult();
+    }
 }
 
 void BuildTreeHelper( wxDataViewModel * model,  wxDataViewItem & item, wxDataViewTreeNode * node)
@@ -3163,7 +3252,7 @@ void BuildTreeHelper( wxDataViewModel * model,  wxDataViewItem & item, wxDataVie
 
     wxDataViewItemArray children;
     unsigned int num = model->GetChildren( item, children);
-    int index = 0;
+    unsigned int index = 0;
     while( index < num )
     {
         if( model->IsContainer( children[index] ) )
@@ -3188,6 +3277,17 @@ void BuildTreeHelper( wxDataViewModel * model,  wxDataViewItem & item, wxDataVie
 
 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;
     SortPrepare();
@@ -3212,9 +3312,12 @@ void DestroyTreeHelper( wxDataViewTreeNode * node )
 
 void wxDataViewMainWindow::DestroyTree()
 {
-    DestroyTreeHelper(m_root);
-    m_root->SetSubTreeCount(0);
-    m_count = 0 ;
+    if (m_root)
+    {
+        DestroyTreeHelper(m_root);
+        m_count = 0;
+        m_root = NULL;
+    }
 }
 
 void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
@@ -3243,6 +3346,20 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
 
     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 );
@@ -3340,7 +3457,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
 
     //Test whether the mouse is hovered on the tree item button
     bool hover = false;
-    if (GetOwner()->GetExpanderColumn() == col)
+    if ((m_root) && (GetOwner()->GetExpanderColumn() == col))
     {
         wxDataViewTreeNode * node = GetTreeNodeByRow(current);
         if( node!=NULL && node->HasChildren() )
@@ -3355,25 +3472,25 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
                 if (m_underMouse && m_underMouse != node)
                 {
                     //wxLogMessage("Undo the row: %d", GetRowByItem(m_underMouse->GetItem()));
-                    Refresh(GetRowByItem(m_underMouse->GetItem()));
+                    RefreshRow(GetRowByItem(m_underMouse->GetItem()));
                 }
                 if (m_underMouse != node)
                 {
                     //wxLogMessage("Do the row: %d", current);
-                    Refresh(current);
+                    RefreshRow(current);
                 }
                 m_underMouse = node;
             }
         }
-     if (node!=NULL && !node->HasChildren())
+        if (node!=NULL && !node->HasChildren())
             delete node;
     }
     if (!hover)
     {
         if (m_underMouse != NULL)
         {
-            wxLogMessage("Undo the row: %d", GetRowByItem(m_underMouse->GetItem()));
-            Refresh(GetRowByItem(m_underMouse->GetItem()));
+            //wxLogMessage("Undo the row: %d", GetRowByItem(m_underMouse->GetItem()));
+            RefreshRow(GetRowByItem(m_underMouse->GetItem()));
             m_underMouse = NULL;
         }
     }
@@ -3414,13 +3531,18 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
         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 (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 );
@@ -3428,12 +3550,13 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
                                   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.SetColumn(col->GetModelColumn());
-                le.SetDataViewColumn(col);
                 le.SetModel(GetOwner()->GetModel());
 
                 parent->GetEventHandler()->ProcessEvent(le);
@@ -3459,7 +3582,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
 
         //Process the event of user clicking the expander
         bool expander = false;
-        if (GetOwner()->GetExpanderColumn() == col)
+        if ((m_root) && (GetOwner()->GetExpanderColumn() == col))
         {
             wxDataViewTreeNode * node = GetTreeNodeByRow(current);
             if( node!=NULL && node->HasChildren() )
@@ -3478,7 +3601,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
             }
         }
         //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) )
@@ -3511,6 +3634,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
             SelectAllRows(false);
             ChangeCurrentRow(current);
             SelectRow(m_currentRow,true);
+            SendSelectionChangedEvent(GetItemByRow( m_currentRow ) );
         }
 
         // notify cell about right click
@@ -3540,10 +3664,9 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
             if ( IsSingleSel() || !IsRowSelected(current) )
             {
                 SelectAllRows( false );
-
                 ChangeCurrentRow(current);
-
                 SelectRow(m_currentRow,true);
+                SendSelectionChangedEvent(GetItemByRow( m_currentRow ) );
             }
             else // multi sel & current is highlighted & no mod keys
             {
@@ -3556,8 +3679,8 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
             if (cmdModifierDown)
             {
                 ChangeCurrentRow(current);
-
                 ReverseRowSelection(m_currentRow);
+                SendSelectionChangedEvent(GetItemByRow(m_selection[0]) );
             }
             else if (event.ShiftDown())
             {
@@ -3573,6 +3696,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
                 }
 
                 SelectRows(lineFrom, lineTo, true);
+                SendSelectionChangedEvent(GetItemByRow(m_selection[0]) );
             }
             else // !ctrl, !shift
             {
@@ -3625,7 +3749,7 @@ wxDataViewItem wxDataViewMainWindow::GetSelection() const
 //-----------------------------------------------------------------------------
 // wxDataViewCtrl
 //-----------------------------------------------------------------------------
-WX_DEFINE_LIST(wxDataViewColumnList);
+WX_DEFINE_LIST(wxDataViewColumnList)
 
 IMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl, wxDataViewCtrlBase)
 
@@ -3649,9 +3773,11 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
            long style, const wxValidator& validator )
 {
     if (!wxControl::Create( parent, id, pos, size,
-                            style | wxScrolledWindowStyle|wxSUNKEN_BORDER, validator))
+                            style | wxScrolledWindowStyle|wxBORDER_SUNKEN, validator))
         return false;
 
+    SetInitialSize(size);
+
     Init();
 
 #ifdef __WXMAC__
@@ -3718,6 +3844,8 @@ bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model )
 
     model->AddNotifier( m_notifier );
 
+    m_clientArea->DestroyTree();
+    
     m_clientArea->BuildTree(model);
 
     m_clientArea->UpdateDisplay();
@@ -3735,6 +3863,16 @@ bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col )
     return true;
 }
 
+bool wxDataViewCtrl::PrependColumn( wxDataViewColumn *col )
+{
+    if (!wxDataViewCtrlBase::PrependColumn(col))
+        return false;
+
+    m_cols.Insert( col );
+    OnColumnChange();
+    return true;
+}
+
 void wxDataViewCtrl::OnColumnChange()
 {
     if (m_headerArea)
@@ -3761,7 +3899,7 @@ unsigned int wxDataViewCtrl::GetColumnCount() const
 wxDataViewColumn* wxDataViewCtrl::GetColumn( unsigned int pos ) const
 {
     wxDataViewColumnList::const_iterator iter;
-    int i = 0;
+    unsigned int i = 0;
     for (iter = m_cols.begin(); iter!=m_cols.end(); iter++)
     {
         if (i == pos)
@@ -3777,7 +3915,7 @@ wxDataViewColumn* wxDataViewCtrl::GetColumn( unsigned int pos ) const
 bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column )
 {
     wxDataViewColumnList::compatibility_iterator  ret = m_cols.Find( column );
-    if (ret == NULL)
+    if (!ret)
         return false;
 
     m_cols.Erase(ret);
@@ -3796,7 +3934,21 @@ bool wxDataViewCtrl::ClearColumns()
 
 int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const
 {
-    return -1;
+    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
@@ -3946,7 +4098,7 @@ void wxDataViewCtrl::EnsureVisible( int row, int column )
 {
     if( row < 0 )
         row = 0;
-    if( row > m_clientArea->GetRowCount() )
+    if( row > (int) m_clientArea->GetRowCount() )
         row = m_clientArea->GetRowCount();
 
     int first = m_clientArea->GetFirstVisibleRow();