Commit ODCombo delete selection fix.

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

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 4f5a5220eb14f4de3a8d38b423b975d404931418..c9ca4db621cfc51f9e1a0ade0363547e85efddaf 100644 (file)
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -10,6 +10,10 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+

 #if wxUSE_DATAVIEWCTRL
 
 #include "wx/dataview.h"
 #if wxUSE_DATAVIEWCTRL
 
 #include "wx/dataview.h"


@@ -19,15 +23,15 @@
 #ifndef WX_PRECOMP
     #include "wx/sizer.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/sizer.h"
     #include "wx/log.h"

+    #include "wx/dcclient.h"
+    #include "wx/timer.h"
+    #include "wx/settings.h"

 #endif
 
 #include "wx/stockitem.h"
 #endif
 
 #include "wx/stockitem.h"

-#include "wx/dcclient.h"

 #include "wx/calctrl.h"
 #include "wx/popupwin.h"
 #include "wx/renderer.h"
 #include "wx/calctrl.h"
 #include "wx/popupwin.h"
 #include "wx/renderer.h"

-#include "wx/timer.h"
-#include "wx/settings.h"

 
 #ifdef __WXMSW__
     #include "wx/msw/wrapwin.h"
 
 #ifdef __WXMSW__
     #include "wx/msw/wrapwin.h"


@@ -114,7 +118,7 @@ private:
     wxTextCtrl             *m_text;
     wxString                m_startValue;
     wxDataViewListModel    *m_model;
     wxTextCtrl             *m_text;
     wxString                m_startValue;
     wxDataViewListModel    *m_model;

-    size_t                  m_col; 
+    size_t                  m_col;

     size_t                  m_row;
     bool                    m_finished;
     bool                    m_aboutToFinish;
     size_t                  m_row;
     bool                    m_finished;
     bool                    m_aboutToFinish;


@@ -166,42 +170,51 @@ public:
     void FinishEditing( wxTextCtrl *text );
 
     void ScrollWindow( int dx, int dy, const wxRect *rect );
     void FinishEditing( wxTextCtrl *text );
 
     void ScrollWindow( int dx, int dy, const wxRect *rect );

-    
+

     bool HasCurrentRow() { return m_currentRow != (size_t)-1; }
     bool HasCurrentRow() { return m_currentRow != (size_t)-1; }

-    
+    void ChangeCurrentRow( size_t row );
+

     bool IsSingleSel() const { return !GetParent()->HasFlag(wxDV_MULTIPLE); };
     bool IsEmpty() { return GetRowCount() == 0; }
     bool IsSingleSel() const { return !GetParent()->HasFlag(wxDV_MULTIPLE); };
     bool IsEmpty() { return GetRowCount() == 0; }

-    
+

     int GetCountPerPage();
     int GetCountPerPage();

-    int GetRowCount();
-    
+    int GetEndOfLastCol();
+    size_t GetFirstVisibleRow();
+    size_t GetLastVisibleRow();
+    size_t GetRowCount();
+

     void SelectAllRows( bool on );
     void SelectRow( size_t row, bool on );
     void SelectRows( size_t from, size_t to, bool on );
     void ReverseRowSelection( size_t row );
     bool IsRowSelected( size_t row );
     void SelectAllRows( bool on );
     void SelectRow( size_t row, bool on );
     void SelectRows( size_t from, size_t to, bool on );
     void ReverseRowSelection( size_t row );
     bool IsRowSelected( size_t row );

-    
+

     void RefreshRow( size_t row );
     void RefreshRows( size_t from, size_t to );
     void RefreshRowsAfter( size_t firstRow );
     void RefreshRow( size_t row );
     void RefreshRows( size_t from, size_t to );
     void RefreshRowsAfter( size_t firstRow );

-    
+

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

-    
+

     wxDataViewColumn           *m_currentCol;
     size_t                      m_currentRow;
     wxDataViewSelection         m_selection;
     wxDataViewColumn           *m_currentCol;
     size_t                      m_currentRow;
     wxDataViewSelection         m_selection;

-    
+

     wxDataViewRenameTimer      *m_renameTimer;
     wxDataViewTextCtrlWrapper  *m_textctrlWrapper;
     bool                        m_lastOnSame;
 
     wxDataViewRenameTimer      *m_renameTimer;
     wxDataViewTextCtrlWrapper  *m_textctrlWrapper;
     bool                        m_lastOnSame;
 

-    wxBrush                    *m_highlightBrush,
-                               *m_highlightUnfocusedBrush;

     bool                        m_hasFocus;
 
     bool                        m_hasFocus;
 

+    int                         m_dragCount;
+    wxPoint                     m_dragStart;
+
+    // for double click logic
+    size_t m_lineLastClicked,
+           m_lineBeforeLastClicked,
+           m_lineSelectSingleOnUp;

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


@@ -334,7 +347,7 @@ bool wxDataViewToggleCell::SetValue( const wxVariant &value )
 {
     m_toggle = value.GetBool();
 
 {
     m_toggle = value.GetBool();
 

-    return true;;
+    return true;

 }
 
 bool wxDataViewToggleCell::GetValue( wxVariant &WXUNUSED(value) )
 }
 
 bool wxDataViewToggleCell::GetValue( wxVariant &WXUNUSED(value) )


@@ -351,14 +364,14 @@ bool wxDataViewToggleCell::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) )
     rect.width = 20;
     rect.y = cell.y + cell.height/2 - 10;
     rect.height = 20;
     rect.width = 20;
     rect.y = cell.y + cell.height/2 - 10;
     rect.height = 20;

-    
+

     int flags = 0;
     if (m_toggle)
         flags |= wxCONTROL_CHECKED;
     if (GetMode() != wxDATAVIEW_CELL_ACTIVATABLE)
         flags |= wxCONTROL_DISABLED;
 
     int flags = 0;
     if (m_toggle)
         flags |= wxCONTROL_CHECKED;
     if (GetMode() != wxDATAVIEW_CELL_ACTIVATABLE)
         flags |= wxCONTROL_DISABLED;
 

-    wxRendererNative::Get().DrawCheckButton(
+    wxRendererNative::Get().DrawCheckBox(

             GetOwner()->GetOwner(),
             *dc,
             rect,
             GetOwner()->GetOwner(),
             *dc,
             rect,


@@ -451,10 +464,6 @@ public:
         sizer->Fit( this );
     }
 
         sizer->Fit( this );
     }
 

-    virtual void OnDismiss()
-    {
-    }
-

     void OnCalendar( wxCalendarEvent &event );
 
     wxCalendarCtrl      *m_cal;
     void OnCalendar( wxCalendarEvent &event );
 
     wxCalendarCtrl      *m_cal;


@@ -462,6 +471,11 @@ public:
     size_t               m_col;
     size_t               m_row;
 
     size_t               m_col;
     size_t               m_row;
 

+protected:
+    virtual void OnDismiss()
+    {
+    }
+

 private:
     DECLARE_EVENT_TABLE()
 };
 private:
     DECLARE_EVENT_TABLE()
 };


@@ -534,12 +548,12 @@ bool wxDataViewDateCell::Activate( wxRect WXUNUSED(cell), wxDataViewListModel *m
 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewColumn, wxDataViewColumnBase)
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewColumn, wxDataViewColumnBase)
 

-wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewCell *cell, size_t model_column, 
+wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewCell *cell, size_t model_column,

         int fixed_width, wxDataViewColumnSizing sizing, int flags ) :
     wxDataViewColumnBase( title, cell, model_column, flags )
 {
     m_sizing = sizing;
         int fixed_width, wxDataViewColumnSizing sizing, int flags ) :
     wxDataViewColumnBase( title, cell, model_column, flags )
 {
     m_sizing = sizing;

-    
+

     m_width = fixed_width;
     m_fixedWidth = fixed_width;
 }
     m_width = fixed_width;
     m_fixedWidth = fixed_width;
 }


@@ -562,7 +576,7 @@ int wxDataViewColumn::GetWidth()
 void wxDataViewColumn::SetFixedWidth( int width )
 {
     m_fixedWidth = width;
 void wxDataViewColumn::SetFixedWidth( int width )
 {
     m_fixedWidth = width;

-    
+

     if (m_sizing == wxDATAVIEW_COL_WIDTH_FIXED)
     {
         m_width = width;
     if (m_sizing == wxDATAVIEW_COL_WIDTH_FIXED)
     {
         m_width = width;


@@ -633,21 +647,14 @@ void wxDataViewHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         wxDataViewColumn *col = GetOwner()->GetColumn( i );
         int width = col->GetWidth();
 
         wxDataViewColumn *col = GetOwner()->GetColumn( i );
         int width = col->GetWidth();
 

-        // the width of the rect to draw: make it smaller to fit entirely
-        // inside the column rect
-#ifdef __WXMAC__

         int cw = width;
         int ch = h;
         int cw = width;
         int ch = h;

-#else
-        int cw = width - 2;
-        int ch = h - 2;
-#endif

 
         wxRendererNative::Get().DrawHeaderButton
                                 (
                                     this,
                                     dc,
 
         wxRendererNative::Get().DrawHeaderButton
                                 (
                                     this,
                                     dc,

-                                    wxRect(xpos+1, 1, cw-1, ch-1),
+                                    wxRect(xpos, 0, cw, ch-1),

                                     m_parent->IsEnabled() ? 0
                                                           : (int)wxCONTROL_DISABLED
                                 );
                                     m_parent->IsEnabled() ? 0
                                                           : (int)wxCONTROL_DISABLED
                                 );


@@ -703,15 +710,15 @@ wxDataViewTextCtrlWrapper::wxDataViewTextCtrlWrapper(
     m_model = model;
     m_row = row;
     m_col = col;
     m_model = model;
     m_row = row;
     m_col = col;

-    m_text = text; 
-    
+    m_text = text;
+

     m_finished = false;
     m_aboutToFinish = false;
     m_finished = false;
     m_aboutToFinish = false;

-    
+

     wxVariant value;
     model->GetValue( value, col, row );
     m_startValue = value.GetString();
     wxVariant value;
     model->GetValue( value, col, row );
     m_startValue = value.GetString();

-    
+

     m_owner->GetOwner()->CalcScrolledPosition(
         rectLabel.x, rectLabel.y, &rectLabel.x, &rectLabel.y );
 
     m_owner->GetOwner()->CalcScrolledPosition(
         rectLabel.x, rectLabel.y, &rectLabel.x, &rectLabel.y );
 


@@ -719,7 +726,7 @@ wxDataViewTextCtrlWrapper::wxDataViewTextCtrlWrapper(
                     wxPoint(rectLabel.x-2,rectLabel.y-2),
                     wxSize(rectLabel.width+7,rectLabel.height+4) );
     m_text->SetFocus();
                     wxPoint(rectLabel.x-2,rectLabel.y-2),
                     wxSize(rectLabel.width+7,rectLabel.height+4) );
     m_text->SetFocus();

-                       
+

     m_text->PushEventHandler(this);
 }
 
     m_text->PushEventHandler(this);
 }
 


@@ -782,7 +789,7 @@ void wxDataViewTextCtrlWrapper::OnKillFocus( wxFocusEvent &event )
         AcceptChanges();
         //if ( !AcceptChanges() )
         //    m_owner->OnRenameCancelled( m_itemEdited );
         AcceptChanges();
         //if ( !AcceptChanges() )
         //    m_owner->OnRenameCancelled( m_itemEdited );

-        
+

         Finish();
     }
 
         Finish();
     }
 


@@ -849,51 +856,39 @@ 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, 0, name ),
+    wxWindow( parent, id, pos, size, wxWANTS_CHARS, name ),

     m_selection( wxDataViewSelectionCmp )
     m_selection( wxDataViewSelectionCmp )

-    
+

 {
     SetOwner( parent );
 
     m_lastOnSame = false;
     m_renameTimer = new wxDataViewRenameTimer( this );
     m_textctrlWrapper = NULL;
 {
     SetOwner( parent );
 
     m_lastOnSame = false;
     m_renameTimer = new wxDataViewRenameTimer( this );
     m_textctrlWrapper = NULL;

-    
+

     // TODO: user better initial values/nothing selected
     m_currentCol = NULL;
     m_currentRow = 0;
 
     // TODO: we need to calculate this smartly
     m_lineHeight = 20;
     // TODO: user better initial values/nothing selected
     m_currentCol = NULL;
     m_currentRow = 0;
 
     // TODO: we need to calculate this smartly
     m_lineHeight = 20;

-    
-    m_highlightBrush = new wxBrush
-                           (
-                            wxSystemSettings::GetColour
-                            (
-                                wxSYS_COLOUR_HIGHLIGHT
-                            ),
-                            wxSOLID
-                           );
-
-    m_highlightUnfocusedBrush = new wxBrush
-                                    (
-                                       wxSystemSettings::GetColour
-                                       (
-                                           wxSYS_COLOUR_BTNSHADOW
-                                       ),
-                                       wxSOLID
-                                    );
-    
+
+    m_dragCount = 0;
+    m_dragStart = wxPoint(0,0);
+    m_lineLastClicked = (size_t) -1;
+    m_lineBeforeLastClicked = (size_t) -1;
+    m_lineSelectSingleOnUp = (size_t) -1;
+

     m_hasFocus = false;
 
     m_hasFocus = false;
 

+    SetBackgroundColour( *wxWHITE );
+

     UpdateDisplay();
 }
 
 wxDataViewMainWindow::~wxDataViewMainWindow()
 {
     delete m_renameTimer;
     UpdateDisplay();
 }
 
 wxDataViewMainWindow::~wxDataViewMainWindow()
 {
     delete m_renameTimer;

-    delete m_highlightBrush;
-    delete m_highlightUnfocusedBrush;

 }
 
 void wxDataViewMainWindow::OnRenameTimer()
 }
 
 void wxDataViewMainWindow::OnRenameTimer()


@@ -919,7 +914,7 @@ void wxDataViewMainWindow::OnRenameTimer()
     wxClassInfo *textControlClass = CLASSINFO(wxTextCtrl);
 
     wxTextCtrl * const text = (wxTextCtrl *)textControlClass->CreateObject();
     wxClassInfo *textControlClass = CLASSINFO(wxTextCtrl);
 
     wxTextCtrl * const text = (wxTextCtrl *)textControlClass->CreateObject();

-    m_textctrlWrapper = new wxDataViewTextCtrlWrapper(this, text, GetOwner()->GetModel(), 
+    m_textctrlWrapper = new wxDataViewTextCtrlWrapper(this, text, GetOwner()->GetModel(),

         m_currentCol->GetModelColumn(), m_currentRow, labelRect );
 }
 
         m_currentCol->GetModelColumn(), m_currentRow, labelRect );
 }
 


@@ -968,7 +963,7 @@ bool wxDataViewMainWindow::ValueChanged( size_t WXUNUSED(col), size_t row )
 bool wxDataViewMainWindow::RowsReordered( size_t *WXUNUSED(new_order) )
 {
     Refresh();
 bool wxDataViewMainWindow::RowsReordered( size_t *WXUNUSED(new_order) )
 {
     Refresh();

-    
+

     return true;
 }
 
     return true;
 }
 


@@ -1039,32 +1034,48 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
     wxDataViewListModel *model = GetOwner()->GetModel();
 
     size_t item_start = wxMax( 0, (update.y / m_lineHeight) );
     wxDataViewListModel *model = GetOwner()->GetModel();
 
     size_t item_start = wxMax( 0, (update.y / m_lineHeight) );

-    size_t item_count = wxMin( (int)(((update.y + update.height) / m_lineHeight) - item_start + 1), 
+    size_t item_count = wxMin( (int)(((update.y + update.height) / m_lineHeight) - item_start + 1),

                                (int)(model->GetNumberOfRows()-item_start) );
 
 
                                (int)(model->GetNumberOfRows()-item_start) );
 
 

-    if (m_hasFocus)
-        dc.SetBrush( *m_highlightBrush );
-    else
-        dc.SetBrush( *m_highlightUnfocusedBrush );
-    dc.SetPen( *wxTRANSPARENT_PEN );
-            
+

     size_t item;
     for (item = item_start; item < item_start+item_count; item++)
     {
         if (m_selection.Index( item ) != wxNOT_FOUND)
         {
     size_t item;
     for (item = item_start; item < item_start+item_count; item++)
     {
         if (m_selection.Index( item ) != wxNOT_FOUND)
         {

-            wxRect rect( 0, item*m_lineHeight+1, 10000, m_lineHeight-2 );
-            dc.DrawRectangle( rect );
+            int flags = wxCONTROL_SELECTED;
+            if (item == m_currentRow)
+                flags |= wxCONTROL_CURRENT;
+            if (m_hasFocus)
+                flags |= wxCONTROL_FOCUSED;
+            wxRect rect( 0, item*m_lineHeight+1, GetEndOfLastCol(), m_lineHeight-2 );
+            wxRendererNative::Get().DrawItemSelectionRect
+                                (
+                                    this,
+                                    dc,
+                                    rect,
+                                    flags
+                                );
+        }
+        else
+        {
+            if (item == m_currentRow)
+            {
+                int flags = wxCONTROL_CURRENT;
+                if (m_hasFocus)
+                    flags |= wxCONTROL_FOCUSED;  // should have no effect
+                wxRect rect( 0, item*m_lineHeight+1, GetEndOfLastCol(), m_lineHeight-2 );
+                wxRendererNative::Get().DrawItemSelectionRect
+                                (
+                                    this,
+                                    dc,
+                                    rect,
+                                    flags
+                                );
+
+            }

         }
         }

-    }
-    
-    dc.SetBrush( *wxTRANSPARENT_BRUSH );
-    dc.SetPen( *wxBLACK_PEN );
-    if (HasCurrentRow())
-    {
-        wxRect rect( 0, m_currentRow*m_lineHeight+1, 10000, m_lineHeight-2 );
-        dc.DrawRectangle( rect );

     }
 
     wxRect cell_rect;
     }
 
     wxRect cell_rect;


@@ -1109,21 +1120,72 @@ int wxDataViewMainWindow::GetCountPerPage()
     return size.y / m_lineHeight;
 }
 
     return size.y / m_lineHeight;
 }
 

-int wxDataViewMainWindow::GetRowCount()
+int wxDataViewMainWindow::GetEndOfLastCol()
+{
+    int width = 0;
+    size_t i;
+    for (i = 0; i < GetOwner()->GetNumberOfColumns(); i++)
+    {
+        wxDataViewColumn *c = GetOwner()->GetColumn( i );
+        width += c->GetWidth();
+    }
+    return width;
+}
+
+size_t wxDataViewMainWindow::GetFirstVisibleRow()
+{
+    int x = 0;
+    int y = 0;
+    m_owner->CalcUnscrolledPosition( x, y, &x, &y );
+
+    return y / m_lineHeight;
+}
+
+size_t wxDataViewMainWindow::GetLastVisibleRow()
+{
+    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 );
+}
+
+size_t wxDataViewMainWindow::GetRowCount()

 {
     return GetOwner()->GetModel()->GetNumberOfRows();
 }
 
 {
     return GetOwner()->GetModel()->GetNumberOfRows();
 }
 

+void wxDataViewMainWindow::ChangeCurrentRow( size_t row )
+{
+    m_currentRow = row;
+
+    // send event
+}
+

 void wxDataViewMainWindow::SelectAllRows( bool on )
 {
 void wxDataViewMainWindow::SelectAllRows( bool on )
 {

-    m_selection.Clear();
+    if (IsEmpty())
+        return;
+

     if (on)
     {
     if (on)
     {

+        m_selection.Clear();
+        for (size_t i = 0; i < GetRowCount(); i++)
+            m_selection.Add( i );
+        Refresh();
+    }
+    else
+    {
+        size_t first_visible = GetFirstVisibleRow();
+        size_t last_visible = GetLastVisibleRow();

         size_t i;
         for (i = 0; i < m_selection.GetCount(); i++)
         size_t i;
         for (i = 0; i < m_selection.GetCount(); i++)

-            m_selection.Add( i );
+        {
+            size_t row = m_selection[i];
+            if ((row >= first_visible) && (row <= last_visible))
+                RefreshRow( row );
+        }
+        m_selection.Clear();

     }
     }

-    Refresh();

 }
 
 void wxDataViewMainWindow::SelectRow( size_t row, bool on )
 }
 
 void wxDataViewMainWindow::SelectRow( size_t row, bool on )


@@ -1178,7 +1240,7 @@ void wxDataViewMainWindow::ReverseRowSelection( size_t row )
         m_selection.Add( row );
     else
         m_selection.Remove( row );
         m_selection.Add( row );
     else
         m_selection.Remove( row );

-    Refresh( row );
+    RefreshRow( row );

 }
 
 bool wxDataViewMainWindow::IsRowSelected( size_t row )
 }
 
 bool wxDataViewMainWindow::IsRowSelected( size_t row )


@@ -1188,9 +1250,9 @@ bool wxDataViewMainWindow::IsRowSelected( size_t row )
 
 void wxDataViewMainWindow::RefreshRow( size_t row )
 {
 
 void wxDataViewMainWindow::RefreshRow( size_t row )
 {

-    wxRect rect( 0, row*m_lineHeight, 10000, m_lineHeight );
+    wxRect rect( 0, row*m_lineHeight, GetEndOfLastCol(), m_lineHeight );

     m_owner->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
     m_owner->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );

-    
+

     wxSize client_size = GetClientSize();
     wxRect client_rect( 0, 0, client_size.x, client_size.y );
     wxRect intersect_rect = client_rect.Intersect( rect );
     wxSize client_size = GetClientSize();
     wxRect client_rect( 0, 0, client_size.x, client_size.y );
     wxRect intersect_rect = client_rect.Intersect( rect );


@@ -1207,9 +1269,9 @@ void wxDataViewMainWindow::RefreshRows( size_t from, size_t to )
         from = tmp;
     }
 
         from = tmp;
     }
 

-    wxRect rect( 0, from*m_lineHeight, 10000, (to-from+1) * m_lineHeight );
+    wxRect rect( 0, from*m_lineHeight, GetEndOfLastCol(), (to-from+1) * m_lineHeight );

     m_owner->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
     m_owner->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );

-    
+

     wxSize client_size = GetClientSize();
     wxRect client_rect( 0, 0, client_size.x, client_size.y );
     wxRect intersect_rect = client_rect.Intersect( rect );
     wxSize client_size = GetClientSize();
     wxRect client_rect( 0, 0, client_size.x, client_size.y );
     wxRect intersect_rect = client_rect.Intersect( rect );


@@ -1220,11 +1282,12 @@ void wxDataViewMainWindow::RefreshRows( size_t from, size_t to )
 void wxDataViewMainWindow::RefreshRowsAfter( size_t firstRow )
 {
     size_t count = GetRowCount();
 void wxDataViewMainWindow::RefreshRowsAfter( size_t firstRow )
 {
     size_t count = GetRowCount();

-    if (firstRow > count) return;
-    
-    wxRect rect( 0, firstRow*m_lineHeight, 10000, count * m_lineHeight );
+    if (firstRow > count)
+        return;
+
+    wxRect rect( 0, firstRow*m_lineHeight, GetEndOfLastCol(), count * m_lineHeight );

     m_owner->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
     m_owner->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );

-    
+

     wxSize client_size = GetClientSize();
     wxRect client_rect( 0, 0, client_size.x, client_size.y );
     wxRect intersect_rect = client_rect.Intersect( rect );
     wxSize client_size = GetClientSize();
     wxRect client_rect( 0, 0, client_size.x, client_size.y );
     wxRect intersect_rect = client_rect.Intersect( rect );


@@ -1234,7 +1297,7 @@ void wxDataViewMainWindow::RefreshRowsAfter( size_t firstRow )
 
 void wxDataViewMainWindow::OnArrowChar(size_t newCurrent, const wxKeyEvent& event)
 {
 
 void wxDataViewMainWindow::OnArrowChar(size_t newCurrent, const wxKeyEvent& event)
 {

-    wxCHECK_RET( newCurrent < (size_t)GetRowCount(),
+    wxCHECK_RET( newCurrent < GetRowCount(),

                  _T("invalid item index in OnArrowChar()") );
 
     // if there is no selection, we cannot move it anywhere
                  _T("invalid item index in OnArrowChar()") );
 
     // if there is no selection, we cannot move it anywhere


@@ -1245,11 +1308,11 @@ void wxDataViewMainWindow::OnArrowChar(size_t newCurrent, const wxKeyEvent& even
 
     // in single selection we just ignore Shift as we can't select several
     // items anyhow
 
     // in single selection we just ignore Shift as we can't select several
     // items anyhow

-    if ( event.ShiftDown() /* && !IsSingleSel() */ )
+    if ( event.ShiftDown() && !IsSingleSel() )

     {
         RefreshRow( oldCurrent );
     {
         RefreshRow( oldCurrent );

-    
-        m_currentRow = newCurrent;
+
+        ChangeCurrentRow( newCurrent );

 
         // select all the items between the old and the new one
         if ( oldCurrent > newCurrent )
 
         // select all the items between the old and the new one
         if ( oldCurrent > newCurrent )


@@ -1262,16 +1325,18 @@ void wxDataViewMainWindow::OnArrowChar(size_t newCurrent, const wxKeyEvent& even
     }
     else // !shift
     {
     }
     else // !shift
     {

-        Refresh( oldCurrent );
-    
+        RefreshRow( oldCurrent );
+

         // all previously selected items are unselected unless ctrl is held
         if ( !event.ControlDown() )
             SelectAllRows(false);
 
         // all previously selected items are unselected unless ctrl is held
         if ( !event.ControlDown() )
             SelectAllRows(false);
 

-        m_currentRow = newCurrent;
+        ChangeCurrentRow( newCurrent );

 
         if ( !event.ControlDown() )
             SelectRow( m_currentRow, true );
 
         if ( !event.ControlDown() )
             SelectRow( m_currentRow, true );

+        else
+            RefreshRow( m_currentRow );

     }
 
     // MoveToFocus();
     }
 
     // MoveToFocus();


@@ -1296,7 +1361,7 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
         event.Skip();
         return;
     }
         event.Skip();
         return;
     }

-    
+

     // don't use m_linesPerPage directly as it might not be computed yet
     const int pageSize = GetCountPerPage();
     wxCHECK_RET( pageSize, _T("should have non zero page size") );
     // don't use m_linesPerPage directly as it might not be computed yet
     const int pageSize = GetCountPerPage();
     wxCHECK_RET( pageSize, _T("should have non zero page size") );


@@ -1309,7 +1374,7 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
             break;
 
         case WXK_DOWN:
             break;
 
         case WXK_DOWN:

-            if ( m_currentRow < (size_t)GetRowCount() - 1 )
+            if ( m_currentRow < GetRowCount() - 1 )

                 OnArrowChar( m_currentRow + 1, event );
             break;
 
                 OnArrowChar( m_currentRow + 1, event );
             break;
 


@@ -1353,6 +1418,13 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
 
 void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
 {
 
 void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
 {

+    if (event.GetEventType() == wxEVT_MOUSEWHEEL)
+    {
+        // let the base handle mouse wheel events.
+        event.Skip();
+        return;
+    }
+

     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 );


@@ -1376,10 +1448,44 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
         return;
     wxDataViewCell *cell = col->GetCell();
 
         return;
     wxDataViewCell *cell = col->GetCell();
 

-    size_t row = y / m_lineHeight;
+    size_t current = y / m_lineHeight;
+
+    if ((current > GetRowCount()) || (x > GetEndOfLastCol()))
+    {
+        // Unselect all if below the last row ?
+        return;
+    }

 
     wxDataViewListModel *model = GetOwner()->GetModel();
 
 
     wxDataViewListModel *model = GetOwner()->GetModel();
 

+    if (event.Dragging())
+    {
+        if (m_dragCount == 0)
+        {
+            // we have to report the raw, physical coords as we want to be
+            // able to call HitTest(event.m_pointDrag) from the user code to
+            // get the item being dragged
+            m_dragStart = event.GetPosition();
+        }
+
+        m_dragCount++;
+
+        if (m_dragCount != 3)
+            return;
+
+        if (event.LeftIsDown())
+        {
+            // Notify cell about drag
+        }
+        return;
+    }
+    else
+    {
+        m_dragCount = 0;
+    }
+
+    bool forceClick = false;
+

     if (event.ButtonDClick())
     {
         m_renameTimer->Stop();
     if (event.ButtonDClick())
     {
         m_renameTimer->Stop();


@@ -1388,22 +1494,38 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
 
     if (event.LeftDClick())
     {
 
     if (event.LeftDClick())
     {

-        if (cell->GetMode() == wxDATAVIEW_CELL_ACTIVATABLE)
+        if ( current == m_lineLastClicked )

         {
         {

-            wxVariant value;
-            model->GetValue( value, col->GetModelColumn(), row );
-            cell->SetValue( value );
-            wxRect cell_rect( xpos, row * m_lineHeight, col->GetWidth(), m_lineHeight );
-            cell->Activate( cell_rect, model, col->GetModelColumn(), row );
+            if (cell->GetMode() == wxDATAVIEW_CELL_ACTIVATABLE)
+            {
+                wxVariant value;
+                model->GetValue( value, col->GetModelColumn(), current );
+                cell->SetValue( value );
+                wxRect cell_rect( xpos, current * m_lineHeight, col->GetWidth(), m_lineHeight );
+                cell->Activate( cell_rect, model, col->GetModelColumn(), current );
+            }
+            return;
+        }
+        else
+        {
+            // The first click was on another item, so don't interpret this as
+            // a double click, but as a simple click instead
+            forceClick = true;

         }
         }

+    }

 
 

-        return;
-    } else

     if (event.LeftUp())
     {
     if (event.LeftUp())
     {

+        if (m_lineSelectSingleOnUp != (size_t)-1)
+        {
+            // select single line
+            SelectAllRows( false );
+            SelectRow( m_lineSelectSingleOnUp, true );
+        }
+

         if (m_lastOnSame)
         {
         if (m_lastOnSame)
         {

-            if ((col == m_currentCol) & (row == m_currentRow) &&
+            if ((col == m_currentCol) && (current == m_currentRow) &&

                 (cell->GetMode() == wxDATAVIEW_CELL_EDITABLE) )
             {
                 m_renameTimer->Start( 100, true );
                 (cell->GetMode() == wxDATAVIEW_CELL_EDITABLE) )
             {
                 m_renameTimer->Start( 100, true );


@@ -1411,43 +1533,130 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
         }
 
         m_lastOnSame = false;
         }
 
         m_lastOnSame = false;

-    } else
-    if (event.LeftDown())
+        m_lineSelectSingleOnUp = (size_t)-1;
+    }
+    else

     {
     {

-        wxDataViewColumn *oldCurrentCol = m_currentCol;
+        // This is necessary, because after a DnD operation in
+        // from and to ourself, the up event is swallowed by the
+        // DnD code. So on next non-up event (which means here and
+        // now) m_lineSelectSingleOnUp should be reset.
+        m_lineSelectSingleOnUp = (size_t)-1;
+    }
+
+    if (event.RightDown())
+    {
+        m_lineBeforeLastClicked = m_lineLastClicked;
+        m_lineLastClicked = current;
+
+        // If the item is already selected, do not update the selection.
+        // Multi-selections should not be cleared if a selected item is clicked.
+        if (!IsRowSelected(current))
+        {
+            SelectAllRows(false);
+            ChangeCurrentRow(current);
+            SelectRow(m_currentRow,true);
+        }
+
+        // notify cell about right click
+        // cell->...
+
+        // Allow generation of context menu event
+        event.Skip();
+    }
+    else if (event.MiddleDown())
+    {
+        // notify cell about middle click
+        // cell->...
+    }
+    if (event.LeftDown() || forceClick)
+    {
+#ifdef __WXMSW__
+        SetFocus();
+#endif
+
+        m_lineBeforeLastClicked = m_lineLastClicked;
+        m_lineLastClicked = current;
+

         size_t oldCurrentRow = m_currentRow;
         size_t oldCurrentRow = m_currentRow;

-        
+        bool oldWasSelected = IsRowSelected(m_currentRow);
+
+        bool cmdModifierDown = event.CmdDown();
+        if ( IsSingleSel() || !(cmdModifierDown || event.ShiftDown()) )
+        {
+            if ( IsSingleSel() || !IsRowSelected(current) )
+            {
+                SelectAllRows( false );
+
+                ChangeCurrentRow(current);
+
+                SelectRow(m_currentRow,true);
+            }
+            else // multi sel & current is highlighted & no mod keys
+            {
+                m_lineSelectSingleOnUp = current;
+                ChangeCurrentRow(current); // change focus
+            }
+        }
+        else // multi sel & either ctrl or shift is down
+        {
+            if (cmdModifierDown)
+            {
+                ChangeCurrentRow(current);
+
+                ReverseRowSelection(m_currentRow);
+            }
+            else if (event.ShiftDown())
+            {
+                ChangeCurrentRow(current);
+
+                size_t lineFrom = oldCurrentRow,
+                       lineTo = current;
+
+                if ( lineTo < lineFrom )
+                {
+                    lineTo = lineFrom;
+                    lineFrom = m_currentRow;
+                }
+
+                SelectRows(lineFrom, lineTo, true);
+            }
+            else // !ctrl, !shift
+            {
+                // test in the enclosing if should make it impossible
+                wxFAIL_MSG( _T("how did we get here?") );
+            }
+        }
+
+        if (m_currentRow != oldCurrentRow)
+            RefreshRow( oldCurrentRow );
+
+        wxDataViewColumn *oldCurrentCol = m_currentCol;
+

         // Update selection here...
         m_currentCol = col;
         // Update selection here...
         m_currentCol = col;

-        m_currentRow = row;
-        RefreshRow( oldCurrentRow );
-        RefreshRow( m_currentRow );
-    
-        m_lastOnSame = (col == oldCurrentCol) && (row == oldCurrentRow);
-        
-        return;
-    }

 
 

-    event.Skip();
+        m_lastOnSame = !forceClick && ((col == oldCurrentCol) && (current == oldCurrentRow)) && oldWasSelected;
+    }

 }
 
 void wxDataViewMainWindow::OnSetFocus( wxFocusEvent &event )
 {
     m_hasFocus = true;
 }
 
 void wxDataViewMainWindow::OnSetFocus( wxFocusEvent &event )
 {
     m_hasFocus = true;

-    
+

     if (HasCurrentRow())
         Refresh();
     if (HasCurrentRow())
         Refresh();

-        
+

     event.Skip();
 }
 
 void wxDataViewMainWindow::OnKillFocus( wxFocusEvent &event )
 {
     m_hasFocus = false;
     event.Skip();
 }
 
 void wxDataViewMainWindow::OnKillFocus( wxFocusEvent &event )
 {
     m_hasFocus = false;

-    
+

     if (HasCurrentRow())
         Refresh();
     if (HasCurrentRow())
         Refresh();

-        
+

     event.Skip();
 }
 
     event.Skip();
 }
 


@@ -1486,7 +1695,11 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
 #endif
 
     m_clientArea = new wxDataViewMainWindow( this, wxID_ANY );
 #endif
 
     m_clientArea = new wxDataViewMainWindow( this, wxID_ANY );

+#ifdef __WXMSW__
+    m_headerArea = new wxDataViewHeaderWindow( this, wxID_ANY, wxDefaultPosition, wxSize(wxDefaultCoord,22) );
+#else

     m_headerArea = new wxDataViewHeaderWindow( this, wxID_ANY, wxDefaultPosition, wxSize(wxDefaultCoord,25) );
     m_headerArea = new wxDataViewHeaderWindow( this, wxID_ANY, wxDefaultPosition, wxSize(wxDefaultCoord,25) );

+#endif

 
     SetTargetWindow( m_clientArea );
 
 
     SetTargetWindow( m_clientArea );
 


@@ -1560,4 +1773,3 @@ bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col )
 
 #endif
     // wxUSE_DATAVIEWCTRL
 
 #endif
     // wxUSE_DATAVIEWCTRL

-