projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
corrected path splitting for mac relative paths
[wxWidgets.git]
/
src
/
os2
/
accel.cpp
diff --git
a/src/os2/accel.cpp
b/src/os2/accel.cpp
index bda2003f77eb3ad4d05ce3bce2c33e4cb228efa3..8e1c6f43b6e2b8863c1e7aab5f2b9a1219b891e5 100644
(file)
--- a/
src/os2/accel.cpp
+++ b/
src/os2/accel.cpp
@@
-90,7
+90,7
@@
wxAcceleratorTable::wxAcceleratorTable(
::WinSetAccelTable( vHabmain
,hAccel
::WinSetAccelTable( vHabmain
,hAccel
- ,(HWND)pFrame->Get
Frame
()
+ ,(HWND)pFrame->Get
HWND
()
);
}
M_ACCELDATA->m_hAccel = hAccel;
);
}
M_ACCELDATA->m_hAccel = hAccel;
@@
-120,11
+120,20
@@
wxAcceleratorTable::wxAcceleratorTable(
USHORT uVirt = AF_CHAR;
if (vaEntries[i].GetFlags() & wxACCEL_ALT)
USHORT uVirt = AF_CHAR;
if (vaEntries[i].GetFlags() & wxACCEL_ALT)
+ {
uVirt |= AF_ALT;
uVirt |= AF_ALT;
+ uVirt |= AF_VIRTUALKEY;
+ }
if (vaEntries[i].GetFlags() & wxACCEL_SHIFT)
if (vaEntries[i].GetFlags() & wxACCEL_SHIFT)
+ {
uVirt |= AF_SHIFT;
uVirt |= AF_SHIFT;
+ uVirt |= AF_VIRTUALKEY;
+ }
if (vaEntries[i].GetFlags() & wxACCEL_CTRL)
if (vaEntries[i].GetFlags() & wxACCEL_CTRL)
+ {
uVirt |= AF_CONTROL;
uVirt |= AF_CONTROL;
+ uVirt |= AF_VIRTUALKEY;
+ }
bool bIsVirtual;
USHORT uKey = wxCharCodeWXToOS2( vaEntries[i].GetKeyCode()
bool bIsVirtual;
USHORT uKey = wxCharCodeWXToOS2( vaEntries[i].GetKeyCode()
@@
-153,7
+162,7
@@
wxAcceleratorTable::wxAcceleratorTable(
::WinSetAccelTable( vHabmain
,M_ACCELDATA->m_hAccel
::WinSetAccelTable( vHabmain
,M_ACCELDATA->m_hAccel
- ,(HWND)pFrame->Get
Frame
()
+ ,(HWND)pFrame->Get
HWND
()
);
}
);
}
@@
-187,11
+196,17
@@
bool wxAcceleratorTable::Translate(
) const
{
PQMSG pMsg = (PQMSG)pWxmsg;
) const
{
PQMSG pMsg = (PQMSG)pWxmsg;
-
- return Ok() && ::WinTranslateAccel( vHabmain
- ,(HWND)hWnd
- ,GetHaccel()
- ,pMsg
- );
+ BOOL rc = FALSE;
+
+ rc = ::WinTranslateAccel( vHabmain
+ ,(HWND)hWnd
+ ,GetHaccel()
+ ,pMsg
+ );
+ if (rc)
+ {
+ int x = 1;
+ }
+ return (Ok() && rc);
} // end of wxAcceleratorTable::Translate
} // end of wxAcceleratorTable::Translate