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
This commit is contained in:
		@@ -28,13 +28,6 @@
 | 
				
			|||||||
// a better solution should be found later...
 | 
					// a better solution should be found later...
 | 
				
			||||||
#define wxUSE_MOUSEEVENT_HACK 0
 | 
					#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
 | 
					// constants
 | 
				
			||||||
// ---------------------------------------------------------------------------
 | 
					// ---------------------------------------------------------------------------
 | 
				
			||||||
@@ -501,5 +494,18 @@ public:
 | 
				
			|||||||
    ~wxWindowCreationHook();
 | 
					    ~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
 | 
					#endif
 | 
				
			||||||
    // _WX_WINDOW_H_
 | 
					    // _WX_WINDOW_H_
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user