From 8e367593b82d57d9eb2bab3282b88b1268a4100c Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Fri, 11 May 2007 19:51:37 +0000
Subject: [PATCH] Use RemoveEventHandler instead of PopEventHandler

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@45969 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 wxPython/wx/lib/masked/combobox.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wxPython/wx/lib/masked/combobox.py b/wxPython/wx/lib/masked/combobox.py
index edbbb37864..1eba82de0c 100644
--- a/wxPython/wx/lib/masked/combobox.py
+++ b/wxPython/wx/lib/masked/combobox.py
@@ -191,9 +191,12 @@ class BaseMaskedComboBox( wx.ComboBox, MaskedEditMixin ):
     def __repr__(self):
         return "<MaskedComboBox: %s>" % self.GetValue()
 
+
     def OnWindowDestroy(self, event):
         # clean up associated event handler object:
-        self.PopEventHandler(deleteHandler=True)
+        if self.RemoveEventHandler(self.evt_handler):
+            self.evt_handler.Destroy()
+        event.Skip()
 
 
     def _CalcSize(self, size=None):