don't call Init() twice when dialog is created in 2 steps

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

diff --git a/src/common/event.cpp b/src/common/event.cpp
index 2ba914fde273af774b17944d8ffccf8791250a08..678d31d3cc41388d481264983cbcf3f96ebe272e 100644 (file)
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -1095,6 +1095,9 @@ void wxEvtHandler::AddPendingEvent(wxEvent& event)
 
 void wxEvtHandler::ProcessPendingEvents()
 {
+    // DE: It doesn't look like this method was intended to be called unless
+    // pending events have already been created.
+    wxASSERT_MSG(m_pendingEvents,wxT("Please call wxApp::ProcessPendingEvents() instead"));
 #if defined(__VISAGECPP__)
     wxENTER_CRIT_SECT( m_eventsLocker);
 #else
@@ -1330,7 +1333,7 @@ bool wxEvtHandler::SearchDynamicEventTable( wxEvent& event )
         wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->GetData();
 #endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES
 
-        if ((event.m_eventType == entry->m_eventType) && entry->m_fn)
+        if ((event.m_eventType == entry->m_eventType) && (entry->m_fn != 0))
         {
             wxEvtHandler *handler =
 #if !WXWIN_COMPATIBILITY_EVENT_TYPES