Fix discrepancy between different ways of measuring text extents under Mac.

[wxWidgets.git] / src / gtk / dataview.cpp

diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index 62fbd52fe2587436ee93ad85f7912916d04229d6..a35bbbd9f8d071dcc3c70d68e27e826f152073f8 100644 (file)
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -4111,8 +4111,6 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
            const wxPoint& pos, const wxSize& size,
            long style, const wxValidator& validator )
 {
-    Init();
-
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator ))
     {
@@ -4216,13 +4214,10 @@ void wxDataViewCtrl::OnInternalIdle()
 
 bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model )
 {
-    if (GetModel())
+    if ( m_internal )
     {
         delete m_internal;
         m_internal = NULL;
-
-        delete m_notifier;
-        m_notifier = NULL;
     }
 
     if (!wxDataViewCtrlBase::AssociateModel( model ))