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

OS/2 Statusbar fixes, and class interface updates

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8454 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2000-10-02 02:49:35 +00:00
parent f5526d3613
commit 5b3ed31135
7 changed files with 251 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/os2/window.cpp
View File

@@ -1718,9 +1718,14 @@ void wxWindow::UnpackCommand(
, WORD* pCmd
)
{
/*
*pId = LOWORD(wParam);
*phWnd = (WXHWND)lParam;
*pCmd = HIWORD(wParam);
*/
*pId = LOWORD(wParam);
*phWnd = NULL; // or may be GetHWND() ?
*pCmd = LOWORD(lParam);
} // end of wxWindow::UnpackCommand
void wxWindow::UnpackActivate(
@@ -1802,7 +1807,7 @@ MRESULT EXPENTRY wxWndProc(
pWnd->SetHWND((WXHWND)hWnd);
}
MRESULT rc = (MRESULT)FALSE;
MRESULT rc = (MRESULT)0;
//
@@ -1821,6 +1826,7 @@ MRESULT EXPENTRY wxWndProc(
else
rc = ::WinDefWindowProc(hWnd, ulMsg, wParam, lParam);
}
return rc;
} // end of wxWndProc
@@ -1881,7 +1887,6 @@ MRESULT wxWindow::OS2WindowProc(
case WM_DESTROY:
HandleDestroy();
bProcessed = TRUE;
// delete this;
break;
case WM_MOVE:
@@ -2337,10 +2342,10 @@ bool wxWindow::OS2Create(
{
ERRORID vError;
wxString sError;
long lX1 = (long)CW_USEDEFAULT;
long lX1 = 0L;
long lY1 = 0L;
long lWidth1 = (long)CW_USEDEFAULT;
long lHeight1 = 100L;
long lWidth1 = 20L;
long lHeight1 = 20L;
int nControlId = 0;
//
@@ -2426,7 +2431,7 @@ bool wxWindow::OS2Create(
wxAssociateWinWithHandle((HWND)m_hWnd
,this
);
//
//
// Now need to subclass window.
//