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

Bitmap and menu updates

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15139 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2002-04-15 03:31:42 +00:00
parent 4ca24f185f
commit 598d8cacef
10 changed files with 131 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/os2/window.cpp
View File

@@ -2759,20 +2759,7 @@ MRESULT wxWindowOS2::OS2WindowProc(
break;
default:
if (m_bLastKeydownProcessed)
{
//
// The key was handled in the EVT_KEY_DOWN and handling
// a key in an EVT_KEY_DOWN handler is meant, by
// design, to prevent EVT_CHARs from happening
//
m_bLastKeydownProcessed = FALSE;
bProcessed = TRUE;
}
else // do generate a CHAR event
{
bProcessed = HandleChar((WXDWORD)wParam, lParam);
}
bProcessed = HandleChar(wParam, lParam);
}
break;
}
@@ -2790,7 +2777,7 @@ MRESULT wxWindowOS2::OS2WindowProc(
}
else // do generate a CHAR event
{
bProcessed = HandleChar((WXDWORD)wParam, lParam, TRUE);
bProcessed = HandleChar(wParam, lParam, TRUE);
break;
}
}
@@ -4050,7 +4037,7 @@ wxKeyEvent wxWindowOS2::CreateKeyEvent(
// WM_KEYDOWN one
//
bool wxWindowOS2::HandleChar(
WXDWORD wParam
WXWPARAM wParam
, WXLPARAM lParam
, bool isASCII
)
@@ -4073,7 +4060,7 @@ bool wxWindowOS2::HandleChar(
//
// If 1 -> 26, translate to CTRL plus a letter.
//
vId = wParam;
vId = (int)wParam;
if ((vId > 0) && (vId < 27))
{
switch (vId)
@@ -4098,7 +4085,7 @@ bool wxWindowOS2::HandleChar(
}
else // we're called from WM_KEYDOWN
{
vId = wxCharCodeOS2ToWX(wParam);
vId = wxCharCodeOS2ToWX((int)wParam);
if (vId == 0)
return FALSE;
}