X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e98351eca92517c55f4c9d706598fefea8604376..d61989a7de90c62c12ddd61cb820162897ed22cd:/src/common/datavcmn.cpp

diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index 61e31e50b2..87e5d3b807 100644
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -533,9 +533,6 @@ void wxDataViewColumnBase::SetFlags(int flags)
 // wxDataViewCtrlBase
 // ---------------------------------------------------------
 
-#include "wx/arrimpl.cpp"
-WX_DEFINE_OBJARRAY(wxDataViewItemArray);
-
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewCtrlBase, wxControl)
 
 wxDataViewCtrlBase::wxDataViewCtrlBase()
@@ -686,6 +683,9 @@ bool wxDataViewCtrlBase::ClearColumns()
 
 wxDataViewColumn* wxDataViewCtrlBase::GetColumn( unsigned int pos )
 {
+    if( pos >= m_cols.GetCount() )
+        return NULL;
+
     return (wxDataViewColumn*) m_cols[ pos ];
 }
 
@@ -698,7 +698,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxDataViewEvent,wxNotifyEvent)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_SELECTED)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_DESELECTED)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK)