diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2012-05-14 18:59:35 +0200 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2012-05-14 19:01:02 +0200 |
| commit | 18e6e7d929c2be209407ed2e56b8ec4d5e6c4900 (patch) | |
| tree | 17fff062d974b081d8fc281391a93b1abc53e335 /vcl | |
| parent | d8ade3ccf6d7832b672edd57ec688515240413b3 (diff) | |
WaE : XKeycodeToKeysym deprecated
Replaced by XkbKeycodeToKeysym
(cf http://nabble.documentfoundation.org/PATCH-Proposed-patch-for-XKeycodeToKeysym-deprecated-td3978158.html)
Change-Id: Ide8331705369d0c38e72bfe693102625e62a87e1
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/generic/app/saldisp.cxx | 6 | ||||
| -rw-r--r-- | vcl/unx/generic/dtrans/X11_selection.cxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index d6060d5f339c..ee4f0948052b 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -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; } diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx index 0bb3527cd6cd..1c4faae2e700 100644 --- a/vcl/unx/generic/dtrans/X11_selection.cxx +++ b/vcl/unx/generic/dtrans/X11_selection.cxx @@ -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 |