Added wxID_PAGE_SETUP standard id

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

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 8a8466446a176f48fc98b193b9492a36f2ec28a0..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,42 @@ 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; }
     void ChangeCurrentRow( size_t row );
     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 GetEndOfLastCol();
     int GetCountPerPage();
     int GetEndOfLastCol();

-    int GetRowCount();
-    
+    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;
 
     int                         m_dragCount;
     bool                        m_hasFocus;
 
     int                         m_dragCount;


@@ -343,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) )


@@ -360,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,


@@ -460,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;


@@ -471,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()
 };


@@ -543,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;
 }


@@ -571,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;


@@ -642,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
                                 );


@@ -712,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 );
 


@@ -728,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);
 }
 


@@ -791,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();
     }
 


@@ -858,16 +856,16 @@ 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: user better initial values/nothing selected
     m_currentCol = NULL;
     m_currentRow = 0;


@@ -880,35 +878,17 @@ wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID i
     m_lineLastClicked = (size_t) -1;
     m_lineBeforeLastClicked = (size_t) -1;
     m_lineSelectSingleOnUp = (size_t) -1;
     m_lineLastClicked = (size_t) -1;
     m_lineBeforeLastClicked = (size_t) -1;
     m_lineSelectSingleOnUp = (size_t) -1;

-    
-    m_highlightBrush = new wxBrush
-                           (
-                            wxSystemSettings::GetColour
-                            (
-                                wxSYS_COLOUR_HIGHLIGHT
-                            ),
-                            wxSOLID
-                           );
-
-    m_highlightUnfocusedBrush = new wxBrush
-                                    (
-                                       wxSystemSettings::GetColour
-                                       (
-                                           wxSYS_COLOUR_BTNSHADOW
-                                       ),
-                                       wxSOLID
-                                    );
-    
+

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


@@ -934,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 );
 }
 


@@ -983,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;
 }
 


@@ -1054,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)
         {

+            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 );
             wxRect rect( 0, item*m_lineHeight+1, GetEndOfLastCol(), m_lineHeight-2 );

-            dc.DrawRectangle( rect );
+            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, GetEndOfLastCol(), m_lineHeight-2 );
-        dc.DrawRectangle( rect );

     }
 
     wxRect cell_rect;
     }
 
     wxRect cell_rect;


@@ -1136,7 +1132,24 @@ int wxDataViewMainWindow::GetEndOfLastCol()
     return width;
 }
 
     return width;
 }
 

-int wxDataViewMainWindow::GetRowCount()
+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();
 }


@@ -1144,20 +1157,35 @@ int wxDataViewMainWindow::GetRowCount()
 void wxDataViewMainWindow::ChangeCurrentRow( size_t row )
 {
     m_currentRow = row;
 void wxDataViewMainWindow::ChangeCurrentRow( size_t row )
 {
     m_currentRow = row;

-    
+

     // send event
 }
 
 void wxDataViewMainWindow::SelectAllRows( bool on )
 {
     // send event
 }
 
 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 )


@@ -1212,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 )


@@ -1224,7 +1252,7 @@ void wxDataViewMainWindow::RefreshRow( size_t row )
 {
     wxRect rect( 0, row*m_lineHeight, GetEndOfLastCol(), m_lineHeight );
     m_owner->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
 {
     wxRect rect( 0, row*m_lineHeight, GetEndOfLastCol(), m_lineHeight );
     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 );


@@ -1243,7 +1271,7 @@ void wxDataViewMainWindow::RefreshRows( size_t from, size_t to )
 
     wxRect rect( 0, from*m_lineHeight, GetEndOfLastCol(), (to-from+1) * m_lineHeight );
     m_owner->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
 
     wxRect rect( 0, from*m_lineHeight, GetEndOfLastCol(), (to-from+1) * m_lineHeight );
     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 );


@@ -1254,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;
-    
+    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 );
     wxRect rect( 0, firstRow*m_lineHeight, GetEndOfLastCol(), count * m_lineHeight );
     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 );


@@ -1268,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


@@ -1282,7 +1311,7 @@ void wxDataViewMainWindow::OnArrowChar(size_t newCurrent, const wxKeyEvent& even
     if ( event.ShiftDown() && !IsSingleSel() )
     {
         RefreshRow( oldCurrent );
     if ( event.ShiftDown() && !IsSingleSel() )
     {
         RefreshRow( oldCurrent );

-    
+

         ChangeCurrentRow( newCurrent );
 
         // select all the items between the old and the new one
         ChangeCurrentRow( newCurrent );
 
         // select all the items between the old and the new one


@@ -1296,8 +1325,8 @@ 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);


@@ -1306,6 +1335,8 @@ void wxDataViewMainWindow::OnArrowChar(size_t newCurrent, const wxKeyEvent& even
 
         if ( !event.ControlDown() )
             SelectRow( m_currentRow, true );
 
         if ( !event.ControlDown() )
             SelectRow( m_currentRow, true );

+        else
+            RefreshRow( m_currentRow );

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


@@ -1330,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") );


@@ -1343,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;
 


@@ -1418,7 +1449,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
     wxDataViewCell *cell = col->GetCell();
 
     size_t current = y / m_lineHeight;
     wxDataViewCell *cell = col->GetCell();
 
     size_t current = y / m_lineHeight;

-    
+

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


@@ -1481,7 +1512,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
             // a double click, but as a simple click instead
             forceClick = true;
         }
             // a double click, but as a simple click instead
             forceClick = true;
         }

-    } 
+    }

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


@@ -1491,10 +1522,10 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
             SelectAllRows( false );
             SelectRow( m_lineSelectSingleOnUp, true );
         }
             SelectAllRows( false );
             SelectRow( m_lineSelectSingleOnUp, true );
         }

-        
+

         if (m_lastOnSame)
         {
         if (m_lastOnSame)
         {

-            if ((col == m_currentCol) & (current == 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 );


@@ -1503,7 +1534,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
 
         m_lastOnSame = false;
         m_lineSelectSingleOnUp = (size_t)-1;
 
         m_lastOnSame = false;
         m_lineSelectSingleOnUp = (size_t)-1;

-    } 
+    }

     else
     {
         // This is necessary, because after a DnD operation in
     else
     {
         // This is necessary, because after a DnD operation in


@@ -1529,7 +1560,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
 
         // notify cell about right click
         // cell->...
 
         // notify cell about right click
         // cell->...

-        
+

         // Allow generation of context menu event
         event.Skip();
     }
         // Allow generation of context menu event
         event.Skip();
     }


@@ -1540,10 +1571,14 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
     }
     if (event.LeftDown() || forceClick)
     {
     }
     if (event.LeftDown() || forceClick)
     {

+#ifdef __WXMSW__
+        SetFocus();
+#endif
+

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

-        size_t oldCurrent = m_currentRow;
+        size_t oldCurrentRow = m_currentRow;

         bool oldWasSelected = IsRowSelected(m_currentRow);
 
         bool cmdModifierDown = event.CmdDown();
         bool oldWasSelected = IsRowSelected(m_currentRow);
 
         bool cmdModifierDown = event.CmdDown();


@@ -1575,7 +1610,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
             {
                 ChangeCurrentRow(current);
 
             {
                 ChangeCurrentRow(current);
 

-                size_t lineFrom = oldCurrent,
+                size_t lineFrom = oldCurrentRow,

                        lineTo = current;
 
                 if ( lineTo < lineFrom )
                        lineTo = current;
 
                 if ( lineTo < lineFrom )


@@ -1593,16 +1628,14 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
             }
         }
 
             }
         }
 

-        if (m_currentRow != oldCurrent)
-            RefreshRow( oldCurrent );
+        if (m_currentRow != oldCurrentRow)
+            RefreshRow( oldCurrentRow );

 
         wxDataViewColumn *oldCurrentCol = m_currentCol;
 
         wxDataViewColumn *oldCurrentCol = m_currentCol;

-        size_t oldCurrentRow = m_currentRow;
-        
+

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

-        m_currentRow = current;
-    
+

         m_lastOnSame = !forceClick && ((col == oldCurrentCol) && (current == oldCurrentRow)) && oldWasSelected;
     }
 }
         m_lastOnSame = !forceClick && ((col == oldCurrentCol) && (current == oldCurrentRow)) && oldWasSelected;
     }
 }


@@ -1610,20 +1643,20 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
 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();
 }
 


@@ -1662,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 );
 


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

-