Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merged 2.2 branch

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2000-07-15 19:51:35 +00:00
parent 8a693e6e04
commit f6bcfd974e
1835 changed files with 237729 additions and 67990 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/os2/window.cpp
View File

@@ -1699,7 +1699,7 @@ bool wxWindow::OS2TranslateMessage(
WXMSG* pMsg
)
{
return m_acceleratorTable.Translate(this, pMsg);
return m_acceleratorTable.Translate(m_hWnd, pMsg);
} // end of wxWindow::OS2TranslateMessage
// ---------------------------------------------------------------------------
@@ -1813,7 +1813,7 @@ MRESULT EXPENTRY wxWndProc(
{
if (pWnd)
rc = pWnd->OS2WindowProc(ulMsg, wParam, lParam);
else
if (!rc)
rc = ::WinDefWindowProc(hWnd, ulMsg, wParam, lParam);
}
return rc;
@@ -1954,7 +1954,6 @@ MRESULT wxWindow::OS2WindowProc(
bProcessed = HandleMouseEvent(uMsg, x, y, (WXUINT)wParam);
}
break;
case WM_SYSCOMMAND:
bProcessed = HandleSysCommand(wParam, lParam);
break;
@@ -2154,7 +2153,7 @@ MRESULT wxWindow::OS2WindowProc(
// wxFrame specific message
case WM_MINMAXFRAME:
bProcessed = HandleGetMinMaxInfo((PSWP)lParam);
bProcessed = HandleGetMinMaxInfo((PSWP)wParam);
break;
case WM_SYSVALUECHANGED:
@@ -2395,6 +2394,7 @@ bool wxWindow::OS2Create(
wxLogError("Can't create window of class %s!. Error: %s\n", zClass, sError);
return FALSE;
}
::WinSetWindowULong(m_hWnd, QWL_USER, (ULONG) this);
wxWndHook = NULL;
#ifdef __WXDEBUG__