Applied patch #957479 (Combobox crashes receiving focus).

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

src/os2/combobox.cpp

@@ -399,11 +399,6 @@ MRESULT EXPENTRY wxComboEditWndProc(
 , MPARAM                            lParam
 )
 {
-    HWND                            hWndCombo;
-    wxWindow*                       pWin = NULL;
-
-    hWndCombo = ::WinQueryWindow(hWnd, QW_PARENT);
-    pWin = (wxWindow*)wxFindWinFromHandle((WXHWND)hWndCombo);
     switch (uMessage)
     {
         //
@@ -412,9 +407,9 @@ MRESULT EXPENTRY wxComboEditWndProc(
         case WM_SETFOCUS:
         case WM_CHAR:
             {
-                wxComboBox*         pCombo = wxDynamicCast( pWin
+                wxComboBox* pCombo = (wxComboBox *)::WinQueryWindowULong( hWnd
-                                                           ,wxComboBox
+                                                                         ,QWL_USER
-                                                          );
+                                                                        );
 
                 if (pCombo->ProcessEditMsg( uMessage
                                            ,wParam