diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index 058d93c724..1d82b1f345 100644
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -1083,6 +1083,8 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED)
 
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU)
+
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED)
@@ -1704,7 +1706,7 @@ void wxDataViewTreeCtrl::OnSize( wxSizeEvent &WXUNUSED(event) )
 #if !defined(__WXGTK20__)
     wxSize size = GetClientSize();
     wxDataViewColumn *col = GetColumn( 0 );
-    col->SetWidth( size.x );
+    if (col) col->SetWidth( size.x );
 #endif
 }
 
diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index a21401fd6f..d7b2598ad1 100644
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -1224,7 +1224,7 @@ void wxDataViewColumn::SetInternalWidth( int width )
 
 void wxDataViewColumn::SetWidth( int width )
 {
-    m_owner->m_headerArea->UpdateDisplay();
+    if (m_owner->m_headerArea) m_owner->m_headerArea->UpdateDisplay();
 
     SetInternalWidth(width);
 }