From: Václav Slavík Date: Tue, 27 Jul 2010 21:45:37 +0000 (+0000) Subject: Created the model in wxDataViewListCtrl::Create(). X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/9ba389145a8cd31020f8ddab612f378b35c64ecb Created the model in wxDataViewListCtrl::Create(). It was totally unexpected that construction through the ctor behaved differently from Create(). Also, the behavior now actually matches documentation. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65120 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp index f7e5749ed1..b63171d118 100644 --- a/src/common/datavcmn.cpp +++ b/src/common/datavcmn.cpp @@ -1600,10 +1600,6 @@ wxDataViewListCtrl::wxDataViewListCtrl( wxWindow *parent, wxWindowID id, const wxValidator& validator ) { Create( parent, id, pos, size, style, validator ); - - wxDataViewListStore *store = new wxDataViewListStore; - AssociateModel( store ); - store->DecRef(); } wxDataViewListCtrl::~wxDataViewListCtrl() @@ -1615,7 +1611,14 @@ bool wxDataViewListCtrl::Create( wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator ) { - return wxDataViewCtrl::Create( parent, id, pos, size, style, validator ); + if ( !wxDataViewCtrl::Create( parent, id, pos, size, style, validator ) ) + return false; + + wxDataViewListStore *store = new wxDataViewListStore; + AssociateModel( store ); + store->DecRef(); + + return true; } bool wxDataViewListCtrl::AppendColumn( wxDataViewColumn *column, const wxString &varianttype )