More AutoComplete crash fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24014 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/src/stc/PlatWX.cpp b/contrib/src/stc/PlatWX.cpp
index 4de8021ab35b572bdbb429e9e4112c86b4392170..322b64f4ccf8b7ffd2cb547fe67867405749d751 100644 (file)
--- a/contrib/src/stc/PlatWX.cpp
+++ b/contrib/src/stc/PlatWX.cpp
@@ -751,9 +751,17 @@ public:
         // things to look right...
         lv->SetFocus();
 
-        Hide();
+    // On OSX and (possibly others) there can still be pending
+    // messages/events for the list control when Scintilla wants to
+    // close it, so do a pending delete of it instead of destroying
+    // immediately.
+    bool Destroy() {
+        if ( !wxPendingDelete.Member(this) )
+            wxPendingDelete.Append(this);
+        return TRUE;
     }
 
+    
     int IconWidth() {
         wxImageList* il = lv->GetImageList(wxIMAGE_LIST_SMALL);
         if (il != NULL) {

diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp
index 4de8021ab35b572bdbb429e9e4112c86b4392170..322b64f4ccf8b7ffd2cb547fe67867405749d751 100644 (file)
--- a/src/stc/PlatWX.cpp
+++ b/src/stc/PlatWX.cpp
@@ -751,9 +751,17 @@ public:
         // things to look right...
         lv->SetFocus();
 
-        Hide();
+    // On OSX and (possibly others) there can still be pending
+    // messages/events for the list control when Scintilla wants to
+    // close it, so do a pending delete of it instead of destroying
+    // immediately.
+    bool Destroy() {
+        if ( !wxPendingDelete.Member(this) )
+            wxPendingDelete.Append(this);
+        return TRUE;
     }
 
+    
     int IconWidth() {
         wxImageList* il = lv->GetImageList(wxIMAGE_LIST_SMALL);
         if (il != NULL) {