Unicode-related compile fixes

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

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index f9e574216ddf825f42cb2c2b3ee64046a47e44cf..44eef8c70e70d2412640f42d15b1d8cfa5f275e0 100644 (file)
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -1364,7 +1364,7 @@ bool wxDataViewHeaderWindowMSW::Create( wxDataViewCtrl *parent, wxWindowID id,
     }
 
     m_imageList = new wxImageList( 16, 16 );
-    Header_SetImageList( (HWND) m_hWnd, m_imageList->GetHIMAGELIST() );
+    (void)Header_SetImageList((HWND) m_hWnd, m_imageList->GetHIMAGELIST());
 
     // we need to subclass the m_hWnd to force wxWindow::HandleNotify
     // to call wxDataViewHeaderWindow::MSWOnNotify
@@ -3274,6 +3274,9 @@ wxDataViewEvent wxDataViewMainWindow::SendExpanderEvent( wxEventType type, const
 
 void wxDataViewMainWindow::OnExpanding( unsigned int row )
 {
+    if (IsVirtualList())
+       return;
+
     wxDataViewTreeNode * node = GetTreeNodeByRow(row);
     if( node != NULL )
     {
@@ -3313,6 +3316,9 @@ void wxDataViewMainWindow::OnExpanding( unsigned int row )
 
 void wxDataViewMainWindow::OnCollapsing(unsigned int row)
 {
+    if (IsVirtualList())
+       return;
+       
     wxDataViewTreeNode * node = GetTreeNodeByRow(row);
     if( node != NULL )
     {