Changeset 56210

Timestamp:

10/10/08 03:02:35 (6 weeks ago)

Author:

RR

Message:

Fix crash again

Location:

wxWidgets/trunk

Files:

• include/wx/generic/dataview.h (modified) (2 diffs)
• src/generic/datavgen.cpp (modified) (3 diffs)

wxWidgets/trunk/include/wx/generic/dataview.h

@@ -390 +390 @@
     wxDataViewCtrl() : wxScrollHelperNative(this)
     {
-        //No sorting column at start, I think
-        m_sortingColumn = NULL;
         Init();
     }
@@ -401 +399 @@
              : wxScrollHelperNative(this)
     {
-        m_sortingColumn = NULL;
         Create(parent, id, pos, size, style, validator );
     }

wxWidgets/trunk/src/generic/datavgen.cpp

@@ -4094 +4094 @@
     m_cols.DeleteContents(true);
     m_notifier = NULL;
+    
+    // No sorting column at start
+    m_sortingColumn = NULL;
+    m_headerArea = NULL;
 }
 
@@ -4103 +4107 @@
         style |= wxBORDER_SUNKEN;
 
+    Init();
+
     if (!wxControl::Create( parent, id, pos, size,
                             style | wxScrolledWindowStyle, validator))
@@ -4108 +4114 @@
 
     SetInitialSize(size);
-
-    Init();
 
 #ifdef __WXMAC__