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

diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index af12af93d392f237962ab2fe61653e4d4ad9e801..9c19488f92bbafa88795fc39babf5b379272f829 100644 (file)
--- 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
 #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;
 
 
 extern wxWinHashTable *wxWinHandleHash;
 

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 1fb516357456821824651c57ea3f5a172ca0ccc3..81f0c914d13cfd0c457fe4acac68aeab907a8521 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -2955,7 +2955,7 @@ wxWinHashTable *wxWinHandleHash = NULL;
 
 wxWindow *wxFindWinFromHandle(WXHWND hWnd)
 {
 
 wxWindow *wxFindWinFromHandle(WXHWND hWnd)
 {

-    return wxWinHandleHash->Get((long)hWnd);
+    return (wxWindow*)wxWinHandleHash->Get((long)hWnd);

 }
 
 void wxAssociateWinWithHandle(HWND hWnd, wxWindowMSW *win)
 }
 
 void wxAssociateWinWithHandle(HWND hWnd, wxWindowMSW *win)