X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/550343399aa1355469ffed72c8cf84c732dcf98b..54af24613f3a2f2d5c47b69923c67f660c61bd09:/src/unix/utilsx11.cpp?ds=inline diff --git a/src/unix/utilsx11.cpp b/src/unix/utilsx11.cpp index cce966d98e..b8ec41fabd 100644 --- a/src/unix/utilsx11.cpp +++ b/src/unix/utilsx11.cpp @@ -15,10 +15,15 @@ #include "wx/wxprec.h" #include "wx/unix/utilsx11.h" + +#ifndef WX_PRECOMP + #include "wx/log.h" + #include "wx/app.h" + #include "wx/icon.h" + #include "wx/image.h" +#endif + #include "wx/iconbndl.h" -#include "wx/image.h" -#include "wx/icon.h" -#include "wx/log.h" #ifdef __VMS #pragma message disable nosimpint @@ -575,9 +580,9 @@ int wxCharCodeXToWX(KeySym keySym) case XK_Down: id = WXK_DOWN; break; case XK_Next: - id = WXK_NEXT; break; + id = WXK_PAGEDOWN; break; case XK_Prior: - id = WXK_PRIOR; break; + id = WXK_PAGEUP; break; case XK_Menu: id = WXK_MENU; break; case XK_Select: @@ -704,8 +709,8 @@ KeySym wxCharCodeWXToX(int id) case WXK_PAUSE: keySym = XK_Pause; break; case WXK_ESCAPE: keySym = XK_Escape; break; case WXK_SPACE: keySym = ' '; break; - case WXK_PRIOR: keySym = XK_Prior; break; - case WXK_NEXT : keySym = XK_Next; break; + case WXK_PAGEUP: keySym = XK_Prior; break; + case WXK_PAGEDOWN: keySym = XK_Next; break; case WXK_END: keySym = XK_End; break; case WXK_HOME : keySym = XK_Home; break; case WXK_LEFT : keySym = XK_Left; break; @@ -770,8 +775,6 @@ KeySym wxCharCodeWXToX(int id) // check current state of a key // ---------------------------------------------------------------------------- -#include - bool wxGetKeyState(wxKeyCode key) { wxASSERT_MSG(key != WXK_LBUTTON && key != WXK_RBUTTON && key !=