Kaydet (Commit) 18e6e7d9 authored tarafından Julien Nabet's avatar Julien Nabet

WaE : XKeycodeToKeysym deprecated

Replaced by XkbKeycodeToKeysym
(cf http://nabble.documentfoundation.org/PATCH-Proposed-patch-for-XKeycodeToKeysym-deprecated-td3978158.html)

Change-Id: Ide8331705369d0c38e72bfe693102625e62a87e1
üst d8ade3cc
......@@ -782,9 +782,9 @@ inline KeySym sal_XModifier2Keysym( Display *pDisplay,
XModifierKeymap *pXModMap,
int n )
{
return XKeycodeToKeysym( pDisplay,
return XkbKeycodeToKeysym( pDisplay,
pXModMap->modifiermap[n*pXModMap->max_keypermod],
0 );
0,0 );
}
void SalDisplay::ModifierMapping()
......@@ -1483,7 +1483,7 @@ KeySym SalDisplay::GetKeySym( XKeyEvent *pEvent,
// Now get the unmodified KeySym for KeyCode retrieval
// try to strip off modifiers, e.g. Ctrl-$ becomes Ctrl-Shift-4
*pUnmodifiedKeySym = XKeycodeToKeysym( GetDisplay(), pEvent->keycode, 0);
*pUnmodifiedKeySym = XkbKeycodeToKeysym( GetDisplay(), pEvent->keycode, 0, 0);
return nKeySym;
}
......
......@@ -2731,7 +2731,7 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage )
else if( rMessage.type == XLIB_KeyPress || rMessage.type == KeyRelease )
{
bHandled = true;
KeySym aKey = XKeycodeToKeysym( m_pDisplay, rMessage.xkey.keycode, 0 );
KeySym aKey = XkbKeycodeToKeysym( m_pDisplay, rMessage.xkey.keycode, 0, 0 );
if( aKey == XK_Escape )
{
// abort drag
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment