moving embedding to common API

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

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 8ab4f85c53765b875efcbed747cdf53ff60095a7..fb301b760d94ff42d28da0c4ca99ebd8ede6e7dc 100644 (file)
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -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 )
     {
@@ -4087,6 +4093,10 @@ void wxDataViewCtrl::Init()
 {
     m_cols.DeleteContents(true);
     m_notifier = NULL;
+    
+    // No sorting column at start
+    m_sortingColumn = NULL;
+    m_headerArea = NULL;
 }
 
 bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
@@ -4096,14 +4106,14 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
     if ( (style & wxBORDER_MASK) == 0)
         style |= wxBORDER_SUNKEN;
 
+    Init();
+
     if (!wxControl::Create( parent, id, pos, size,
                             style | wxScrolledWindowStyle, validator))
         return false;
 
     SetInitialSize(size);
 
-    Init();
-
 #ifdef __WXMAC__
     MacSetClipChildren( true );
 #endif
@@ -4145,6 +4155,15 @@ WXLRESULT wxDataViewCtrl::MSWWindowProc(WXUINT nMsg,
 }
 #endif
 
+wxSize wxDataViewCtrl::GetSizeAvailableForScrollTarget(const wxSize& size)
+{
+    wxSize newsize = size;
+    if (!HasFlag(wxDV_NO_HEADER) && (m_headerArea))
+       newsize.y -= m_headerArea->GetSize().y;
+    
+    return newsize;
+}
+
 void wxDataViewCtrl::OnSize( wxSizeEvent &WXUNUSED(event) )
 {
     // We need to override OnSize so that our scrolled