diff --git a/src/propgrid/editors.cpp b/src/propgrid/editors.cpp
index f080c19e9c..5418c64711 100644
--- a/src/propgrid/editors.cpp
+++ b/src/propgrid/editors.cpp
@@ -520,12 +520,9 @@ class wxPGDoubleClickProcessor : public wxEvtHandler
 {
 public:
 
-    wxPGDoubleClickProcessor( wxOwnerDrawnComboBox* combo, wxPGProperty* property )
+    wxPGDoubleClickProcessor( wxOwnerDrawnComboBox* combo, wxBoolProperty* property )
         : wxEvtHandler()
     {
-        wxASSERT_MSG( wxDynamicCast(property, wxBoolProperty),
-           wxS("Double-click processor should be used only with wxBoolProperty") );
-
         m_timeLastMouseUp = 0;
         m_combo = combo;
         m_property = property;
@@ -589,7 +586,7 @@ protected:
 private:
     wxMilliClock_t              m_timeLastMouseUp;
     wxOwnerDrawnComboBox*       m_combo;
-    wxPGProperty*               m_property;  // Selected property
+    wxBoolProperty*             m_property;  // Selected property
     bool                        m_downReceived;
 
     wxDECLARE_EVENT_TABLE();
@@ -646,9 +643,10 @@ public:
         // only for wxBoolProperty.
         m_selProp = GetGrid()->GetSelection();
         wxASSERT(m_selProp);
-        if (wxDynamicCast(m_selProp, wxBoolProperty))
+        wxBoolProperty* boolProp = wxDynamicCast(m_selProp, wxBoolProperty);
+        if ( boolProp )
         {
-            m_dclickProcessor = new wxPGDoubleClickProcessor(this, m_selProp);
+            m_dclickProcessor = new wxPGDoubleClickProcessor(this, boolProp);
             PushEventHandler(m_dclickProcessor);
         }