From cbc8c6ee975d21dcff03a3fef088552fe5edfb69 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 22 Mar 2004 18:06:23 +0000 Subject: [PATCH 1/1] moved wxWinHandleHash below wxWindow declaration as otherwise the dtor of forward declared wxWindow is not called inside WX_DECLARE_HASH git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26295 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/window.h | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h index 068b7a596b..ceac168c81 100644 --- a/include/wx/msw/window.h +++ b/include/wx/msw/window.h @@ -28,13 +28,6 @@ // a better solution should be found later... #define wxUSE_MOUSEEVENT_HACK 0 -#include "wx/hash.h" - -// pseudo-template HWND <-> wxWindow hash table -WX_DECLARE_HASH(wxWindow, wxWindowList, wxWinHashTable); - -extern wxWinHashTable *wxWinHandleHash; - // --------------------------------------------------------------------------- // constants // --------------------------------------------------------------------------- @@ -501,5 +494,18 @@ public: ~wxWindowCreationHook(); }; +// ---------------------------------------------------------------------------- +// global objects +// ---------------------------------------------------------------------------- + +// notice that this hash must be defined after wxWindow declaration as it +// needs to "see" its dtor and not just forward declaration +#include "wx/hash.h" + +// pseudo-template HWND <-> wxWindow hash table +WX_DECLARE_HASH(wxWindow, wxWindowList, wxWinHashTable); + +extern wxWinHashTable *wxWinHandleHash; + #endif // _WX_WINDOW_H_ -- 2.45.2