Switch off the tests on Windows and switch back on the email notifications.

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

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 008eee74744d86b2d3f05971629d9ea41d01e58a..ed190733d24949f976f3716ff139b881de18bd86 100644 (file)
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -153,6 +153,8 @@ public:
     virtual void ScrollWindow(int dx, int dy, const wxRect *rect = NULL);
 
     virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+    
+    virtual bool AcceptsFocusFromKeyboard() const { return false; }
 
 protected:
     virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
@@ -2651,7 +2653,7 @@ void wxDataViewMainWindow::ScrollTo( int rows, int column )
     {
         wxRect rect = GetClientRect();
         int colnum = 0;
-        int x_start = 0, w = 0;
+        int x_start, w = 0;
         int xx, yy, xe;
         m_owner->CalcUnscrolledPosition( rect.x, rect.y, &xx, &yy );
         for (x_start = 0; colnum < column; colnum++)
@@ -2691,7 +2693,7 @@ int wxDataViewMainWindow::GetEndOfLastCol() const
     for (i = 0; i < GetOwner()->GetColumnCount(); i++)
     {
         const wxDataViewColumn *c =
-            wx_const_cast(wxDataViewCtrl*, GetOwner())->GetColumn( i );
+            const_cast<wxDataViewCtrl*>(GetOwner())->GetColumn( i );
 
         if (!c->IsHidden())
             width += c->GetWidth();
@@ -3630,7 +3632,7 @@ void wxDataViewMainWindow::DestroyTree()
 
 void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
 {
-    if ( HandleAsNavigationKey(event) )
+    if ( GetParent()->HandleAsNavigationKey(event) )
         return;
 
     // no item -> nothing to do
@@ -4177,6 +4179,12 @@ void wxDataViewCtrl::OnSize( wxSizeEvent &WXUNUSED(event) )
     AdjustScrollbars();
 }
 
+void wxDataViewCtrl::SetFocus()
+{
+    if (m_clientArea)
+        m_clientArea->SetFocus();
+}
+
 bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model )
 {
     if (!wxDataViewCtrlBase::AssociateModel( model ))