Warning fixes found under hardest mode of OpenWatcom. Seems clean in Borland, MinGW and DMC.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29697 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-10-07 13:36:41 +00:00
parent b4e0b521e0
commit 373a5fb355
10 changed files with 28 additions and 20 deletions

View File

@@ -5045,10 +5045,10 @@ int wxCharCodeMSWToWX(int keySym, WXLPARAM lParam)
return id;
}
int wxCharCodeWXToMSW(int id, bool *isVirtual)
WXWORD wxCharCodeWXToMSW(int id, bool *isVirtual)
{
*isVirtual = true;
int keySym;
WXWORD keySym;
switch (id)
{
case WXK_CANCEL: keySym = VK_CANCEL; break;
@@ -5117,7 +5117,7 @@ int wxCharCodeWXToMSW(int id, bool *isVirtual)
default:
{
*isVirtual = false;
keySym = id;
keySym = (WORD)id;
break;
}
}
@@ -5127,7 +5127,7 @@ int wxCharCodeWXToMSW(int id, bool *isVirtual)
bool wxGetKeyState(wxKeyCode key)
{
bool bVirtual;
int vkey = wxCharCodeWXToMSW(key, &bVirtual);
WORD vkey = wxCharCodeWXToMSW(key, &bVirtual);
SHORT state;
switch (key)