From: Stefan Neis <Stefan.Neis@t-online.de>
Date: Fri, 21 May 2004 09:35:18 +0000 (+0000)
Subject: Applied patch #957479 (Combobox crashes receiving focus).
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/d804ec694d2d120b40a28166b1a7d34401edfd9c

Applied patch #957479 (Combobox crashes receiving focus).


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

diff --git a/src/os2/combobox.cpp b/src/os2/combobox.cpp
index c8e5138c7b..5017194242 100644
--- a/src/os2/combobox.cpp
+++ b/src/os2/combobox.cpp
@@ -413,11 +413,6 @@ MRESULT EXPENTRY wxComboEditWndProc(
 , MPARAM                            lParam
 )
 {
-    HWND                            hWndCombo;
-    wxWindow*                       pWin = NULL;
-
-    hWndCombo = ::WinQueryWindow(hWnd, QW_PARENT);
-    pWin = (wxWindow*)wxFindWinFromHandle((WXHWND)hWndCombo);
     switch (uMessage)
     {
         //
@@ -426,9 +421,9 @@ MRESULT EXPENTRY wxComboEditWndProc(
         case WM_SETFOCUS:
         case WM_CHAR:
             {
-                wxComboBox*         pCombo = wxDynamicCast( pWin
-                                                           ,wxComboBox
-                                                          );
+                wxComboBox* pCombo = (wxComboBox *)::WinQueryWindowULong( hWnd
+                                                                         ,QWL_USER
+                                                                        );
 
                 if (pCombo->ProcessEditMsg( uMessage
                                            ,wParam