From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 5 Mar 2008 15:16:50 +0000 (+0000)
Subject: call SetHWND(hWnd) from SubclassWin(), this is consistent with calling SetHWND(0... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/e322e3b6cc47095cbe39cf955b3bffc99c18879f

call SetHWND(hWnd) from SubclassWin(), this is consistent with calling SetHWND(0) from UnsubclassWin()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52335 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 3efc43f1e9..8f009f6ffa 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -1193,6 +1193,8 @@ void wxWindowMSW::SubclassWin(WXHWND hWnd)
     HWND hwnd = (HWND)hWnd;
     wxCHECK_RET( ::IsWindow(hwnd), wxT("invalid HWND in SubclassWin") );
 
+    SetHWND(hWnd);
+
     wxAssociateWinWithHandle(hwnd, this);
 
     m_oldWndProc = (WXFARPROC)wxGetWindowProc((HWND)hWnd);
@@ -1251,7 +1253,7 @@ void wxWindowMSW::AssociateHandle(WXWidget handle)
 
     WXHWND wxhwnd = (WXHWND)handle;
 
-    SetHWND(wxhwnd);
+    // this also calls SetHWND(wxhwnd)
     SubclassWin(wxhwnd);
 }