moving embedding to common API

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

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 23bc5ec610a4dd13bc693eae6953f3951cd90ec2..fb301b760d94ff42d28da0c4ca99ebd8ede6e7dc 100644 (file)
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -4093,6 +4093,10 @@ void wxDataViewCtrl::Init()
 {
     m_cols.DeleteContents(true);
     m_notifier = NULL;
 {
     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,
 }
 
 bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,


@@ -4102,14 +4106,14 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
     if ( (style & wxBORDER_MASK) == 0)
         style |= wxBORDER_SUNKEN;
 
     if ( (style & wxBORDER_MASK) == 0)
         style |= wxBORDER_SUNKEN;
 

+    Init();
+

     if (!wxControl::Create( parent, id, pos, size,
                             style | wxScrolledWindowStyle, validator))
         return false;
 
     SetInitialSize(size);
 
     if (!wxControl::Create( parent, id, pos, size,
                             style | wxScrolledWindowStyle, validator))
         return false;
 
     SetInitialSize(size);
 

-    Init();
-

 #ifdef __WXMAC__
     MacSetClipChildren( true );
 #endif
 #ifdef __WXMAC__
     MacSetClipChildren( true );
 #endif


@@ -4154,7 +4158,7 @@ WXLRESULT wxDataViewCtrl::MSWWindowProc(WXUINT nMsg,
 wxSize wxDataViewCtrl::GetSizeAvailableForScrollTarget(const wxSize& size)
 {
     wxSize newsize = size;
 wxSize wxDataViewCtrl::GetSizeAvailableForScrollTarget(const wxSize& size)
 {
     wxSize newsize = size;

-    if (!HasFlag(wxDV_NO_HEADER))
+    if (!HasFlag(wxDV_NO_HEADER) && (m_headerArea))

        newsize.y -= m_headerArea->GetSize().y;
     
     return newsize;
        newsize.y -= m_headerArea->GetSize().y;
     
     return newsize;