don't stop on NULs in Replace()

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

diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index 645aa4ed0ebedae7bc6327a4bd3d3b73e791a71c..7f85194b9bc8065dff598ef1a550bd75f2378861 100644 (file)
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -18,9 +18,10 @@
 #if wxUSE_DATAVIEWCTRL
 
 #include "wx/dataview.h"
 #if wxUSE_DATAVIEWCTRL
 
 #include "wx/dataview.h"

-

 #include "wx/spinctrl.h"
 
 #include "wx/spinctrl.h"
 

+#include "wx/weakref.h"
+

 #ifndef WX_PRECOMP
     #include "wx/dc.h"
     #include "wx/settings.h"
 #ifndef WX_PRECOMP
     #include "wx/dc.h"
     #include "wx/settings.h"


@@ -658,15 +659,29 @@ wxDataViewRendererBase::wxDataViewRendererBase( const wxString &varianttype,
                                                 int WXUNUSED(align) )
 {
     m_variantType = varianttype;
                                                 int WXUNUSED(align) )
 {
     m_variantType = varianttype;

-    m_editorCtrl = NULL;

     m_owner = NULL;
 }
 
     m_owner = NULL;
 }
 

+wxDataViewRendererBase::~wxDataViewRendererBase()
+{
+}
+

 const wxDataViewCtrl* wxDataViewRendererBase::GetView() const
 {
     return wx_const_cast(wxDataViewRendererBase*, this)->GetOwner()->GetOwner();
 }
 
 const wxDataViewCtrl* wxDataViewRendererBase::GetView() const
 {
     return wx_const_cast(wxDataViewRendererBase*, this)->GetOwner()->GetOwner();
 }
 

+class wxKillRef: public wxWindowRef
+{       
+public: 
+   wxKillRef( wxWindow *win ) : wxWindowRef( win ) { }
+   virtual void OnObjectDestroy()
+   {
+      get()->PopEventHandler( true );
+      delete this;
+   }
+};
+

 bool wxDataViewRendererBase::StartEditing( const wxDataViewItem &item, wxRect labelRect )
 {
     m_item = item; // remember for later
 bool wxDataViewRendererBase::StartEditing( const wxDataViewItem &item, wxRect labelRect )
 {
     m_item = item; // remember for later


@@ -676,6 +691,7 @@ bool wxDataViewRendererBase::StartEditing( const wxDataViewItem &item, wxRect la
     GetOwner()->GetOwner()->GetModel()->GetValue( value, item, col );
 
     m_editorCtrl = CreateEditorCtrl( GetOwner()->GetOwner()->GetMainWindow(), labelRect, value );
     GetOwner()->GetOwner()->GetModel()->GetValue( value, item, col );
 
     m_editorCtrl = CreateEditorCtrl( GetOwner()->GetOwner()->GetMainWindow(), labelRect, value );

+    (void) new wxKillRef( m_editorCtrl.get() );

 
     wxDataViewEditorCtrlEvtHandler *handler =
         new wxDataViewEditorCtrlEvtHandler( m_editorCtrl, (wxDataViewRenderer*) this );
 
     wxDataViewEditorCtrlEvtHandler *handler =
         new wxDataViewEditorCtrlEvtHandler( m_editorCtrl, (wxDataViewRenderer*) this );


@@ -700,11 +716,10 @@ bool wxDataViewRendererBase::StartEditing( const wxDataViewItem &item, wxRect la
 
 void wxDataViewRendererBase::CancelEditing()
 {
 
 void wxDataViewRendererBase::CancelEditing()
 {

-    wxPendingDelete.Append( m_editorCtrl );
-

     GetOwner()->GetOwner()->GetMainWindow()->SetFocus();
     GetOwner()->GetOwner()->GetMainWindow()->SetFocus();

-
-    // m_editorCtrl->PopEventHandler( true );
+    
+    m_editorCtrl->Hide();
+    wxPendingDelete.Append( m_editorCtrl );

 }
 
 bool wxDataViewRendererBase::FinishEditing()
 }
 
 bool wxDataViewRendererBase::FinishEditing()


@@ -712,10 +727,11 @@ bool wxDataViewRendererBase::FinishEditing()
     wxVariant value;
     GetValueFromEditorCtrl( m_editorCtrl, value );
 
     wxVariant value;
     GetValueFromEditorCtrl( m_editorCtrl, value );
 

-    wxPendingDelete.Append( m_editorCtrl );
-

     GetOwner()->GetOwner()->GetMainWindow()->SetFocus();
 
     GetOwner()->GetOwner()->GetMainWindow()->SetFocus();
 

+    m_editorCtrl->Hide();
+    wxPendingDelete.Append( m_editorCtrl );
+    

     if (!Validate(value))
         return false;
 
     if (!Validate(value))
         return false;
 


@@ -723,8 +739,6 @@ bool wxDataViewRendererBase::FinishEditing()
     GetOwner()->GetOwner()->GetModel()->SetValue( value, m_item, col );
     GetOwner()->GetOwner()->GetModel()->ValueChanged( m_item, col );
 
     GetOwner()->GetOwner()->GetModel()->SetValue( value, m_item, col );
     GetOwner()->GetOwner()->GetModel()->ValueChanged( m_item, col );
 

-    // m_editorCtrl->PopEventHandler( true );
-

     // Now we should send Editing Done event
     wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE, GetOwner()->GetOwner()->GetId() );
     event.SetDataViewColumn( GetOwner() );
     // Now we should send Editing Done event
     wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE, GetOwner()->GetOwner()->GetId() );
     event.SetDataViewColumn( GetOwner() );


@@ -772,7 +786,6 @@ void wxDataViewEditorCtrlEvtHandler::OnChar( wxKeyEvent &event )
     switch ( event.m_keyCode )
     {
         case WXK_RETURN:
     switch ( event.m_keyCode )
     {
         case WXK_RETURN:

-            wxPrintf( "OnChar RETURN\n" );

             m_finished = true;
             m_owner->FinishEditing();
             break;
             m_finished = true;
             m_owner->FinishEditing();
             break;


@@ -791,7 +804,6 @@ void wxDataViewEditorCtrlEvtHandler::OnKillFocus( wxFocusEvent &event )
 {
     if (!m_finished)
     {
 {
     if (!m_finished)
     {

-        wxPrintf( "OnKillFocus\n" );

         m_finished = true;
         m_owner->FinishEditing();
     }
         m_finished = true;
         m_owner->FinishEditing();
     }