Patches-1851591 ] dataview sample is crashing (under MSW)

[wxWidgets.git] / src / common / datavcmn.cpp

diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index 058d93c724ecf5f7125984c030737ebab1e5559e..1d82b1f3451156349891fb0868e0c6d49f698915 100644 (file)
--- 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
 }