From a0826b119e63f4cfbf8361cbaf7cedef56e0ec53 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 24 May 2007 23:53:05 +0000
Subject: [PATCH] disable clearing event tables by default, only do it if
wxUSE_MEMORY_TRACING is used: this fixes the problems with events not being
dispatched correctly when the library is reinitialized
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46201 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
include/wx/event.h | 2 ++
src/common/event.cpp | 45 ++++++++++++++++++++++----------------------
2 files changed, 25 insertions(+), 22 deletions(-)
diff --git a/include/wx/event.h b/include/wx/event.h
index ed8f827f9c..469d6534c9 100644
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -2285,8 +2285,10 @@ public:
// Clear table
void Clear();
+#if defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING
// Clear all tables
static void ClearAll();
+#endif // __WXDEBUG__ && wxUSE_MEMORY_TRACING
protected:
// Init the hash table with the entries of the static event table.
diff --git a/src/common/event.cpp b/src/common/event.cpp
index 68a17045f2..e315b4d0fc 100644
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -107,22 +107,26 @@ const wxEventTableEntry wxEvtHandler::sm_eventTableEntries[] =
{ DECLARE_EVENT_TABLE_ENTRY(wxEVT_NULL, 0, 0, (wxObjectEventFunction)NULL, NULL) };
-#ifdef __WXDEBUG__
-// Clear up event hash table contents or we can get problems
-// when C++ is cleaning up the static object
+// wxUSE_MEMORY_TRACING considers memory freed from the static objects dtors
+// leaked, so we need to manually clean up all event tables before checking for
+// the memory leaks when using it, however this breaks re-initializing the
+// library (i.e. repeated calls to wxInitialize/wxUninitialize) because the
+// event tables won't be rebuilt the next time, so disable this by default
+#if defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING
+
class wxEventTableEntryModule: public wxModule
{
-DECLARE_DYNAMIC_CLASS(wxEventTableEntryModule)
public:
- wxEventTableEntryModule() {}
- bool OnInit() { return true; }
- void OnExit()
- {
- wxEventHashTable::ClearAll();
- }
+ wxEventTableEntryModule() { }
+ virtual bool OnInit() { return true; }
+ virtual void OnExit() { wxEventHashTable::ClearAll(); }
+
+ DECLARE_DYNAMIC_CLASS(wxEventTableEntryModule)
};
+
IMPLEMENT_DYNAMIC_CLASS(wxEventTableEntryModule, wxModule)
-#endif
+
+#endif // __WXDEBUG__ && wxUSE_MEMORY_TRACING
// ----------------------------------------------------------------------------
// global variables
@@ -801,25 +805,20 @@ wxEventHashTable::~wxEventHashTable()
void wxEventHashTable::Clear()
{
- size_t i;
- for(i = 0; i < m_size; i++)
+ for ( size_t i = 0; i < m_size; i++ )
{
EventTypeTablePointer eTTnode = m_eventTypeTable[i];
- if (eTTnode)
- {
- delete eTTnode;
- }
+ delete eTTnode;
}
- // Necessary in order to not invoke the
- // overloaded delete operator when statics are cleaned up
- if (m_eventTypeTable)
- delete[] m_eventTypeTable;
-
+ delete[] m_eventTypeTable;
m_eventTypeTable = NULL;
+
m_size = 0;
}
+#if defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING
+
// Clear all tables
void wxEventHashTable::ClearAll()
{
@@ -831,6 +830,8 @@ void wxEventHashTable::ClearAll()
}
}
+#endif // __WXDEBUG__ && wxUSE_MEMORY_TRACING
+
bool wxEventHashTable::HandleEvent(wxEvent &event, wxEvtHandler *self)
{
if (m_rebuildHash)
--
2.47.2