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:
@@ -92,7 +92,7 @@ wxAcceleratorTable::wxAcceleratorTable(const wxString& resource)
|
||||
M_ACCELDATA->m_ok = (hAccel != 0);
|
||||
}
|
||||
|
||||
extern int wxCharCodeWXToMSW(int id, bool *isVirtual);
|
||||
extern WXWORD wxCharCodeWXToMSW(int id, bool *isVirtual);
|
||||
|
||||
// Create from an array
|
||||
wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[])
|
||||
@@ -114,13 +114,13 @@ wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]
|
||||
|
||||
bool isVirtual;
|
||||
|
||||
WORD key = (WORD)wxCharCodeWXToMSW(entries[i].GetKeyCode(), &isVirtual);
|
||||
WORD key = wxCharCodeWXToMSW(entries[i].GetKeyCode(), &isVirtual);
|
||||
if (isVirtual)
|
||||
fVirt |= FVIRTKEY;
|
||||
|
||||
arr[i].fVirt = fVirt;
|
||||
arr[i].key = key;
|
||||
arr[i].cmd = entries[i].GetCommand();
|
||||
arr[i].cmd = (WORD)entries[i].GetCommand();
|
||||
}
|
||||
|
||||
M_ACCELDATA->m_hAccel = ::CreateAcceleratorTable(arr, n);
|
||||
|
Reference in New Issue
Block a user