Fix crash again

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56210 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/generic/dataview.h b/include/wx/generic/dataview.h
index 8296c5eef848ddb3fb72482717efdaa06daf5415..de5b2255817935ae3ebe04bcb3429d4e351b78d0 100644 (file)
--- a/include/wx/generic/dataview.h
+++ b/include/wx/generic/dataview.h
@@ -389,8 +389,6 @@ class WXDLLIMPEXP_ADV wxDataViewCtrl: public wxDataViewCtrlBase,
 public:
     wxDataViewCtrl() : wxScrollHelperNative(this)
     {
 public:
     wxDataViewCtrl() : wxScrollHelperNative(this)
     {

-        //No sorting column at start, I think
-        m_sortingColumn = NULL;

         Init();
     }
 
         Init();
     }
 


@@ -400,7 +398,6 @@ public:
            const wxValidator& validator = wxDefaultValidator )
              : wxScrollHelperNative(this)
     {
            const wxValidator& validator = wxDefaultValidator )
              : wxScrollHelperNative(this)
     {

-        m_sortingColumn = NULL;

         Create(parent, id, pos, size, style, validator );
     }
 
         Create(parent, id, pos, size, style, validator );
     }
 

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 794a94a96637e63278aabf8d262da4abeaa788f0..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