From 40ad34262a834611ec166231bc8a12f5f1ba42be Mon Sep 17 00:00:00 2001 From: Mattia Barbon Date: Sat, 8 May 2004 10:19:14 +0000 Subject: [PATCH] wxUniversal compilation fix. The fix is ok because this ash is a wxMSW data structure, and can only contain wxMSW windows. Compilation tested with and without wxUniversal and with and without WXWIN_COMPATIBILITY_2_4. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27176 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/window.h | 2 +- src/msw/window.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h index af12af93d3..9c19488f92 100644 --- a/include/wx/msw/window.h +++ b/include/wx/msw/window.h @@ -502,7 +502,7 @@ public: #include "wx/hash.h" // pseudo-template HWND <-> wxWindow hash table -WX_DECLARE_HASH(wxWindow, wxWindowList, wxWinHashTable); +WX_DECLARE_HASH(wxWindowMSW, wxWindowList, wxWinHashTable); extern wxWinHashTable *wxWinHandleHash; diff --git a/src/msw/window.cpp b/src/msw/window.cpp index 1fb5163574..81f0c914d1 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -2955,7 +2955,7 @@ wxWinHashTable *wxWinHandleHash = NULL; wxWindow *wxFindWinFromHandle(WXHWND hWnd) { - return wxWinHandleHash->Get((long)hWnd); + return (wxWindow*)wxWinHandleHash->Get((long)hWnd); } void wxAssociateWinWithHandle(HWND hWnd, wxWindowMSW *win) -- 2.45.2