Applied patch [ 608850 ] wxX11 menu accelerators need toupper

Olly Betts

Letter menu accelerators (with and probably without
modifiers) don't work unless you have capslock on.
Adding a call to toupper() to the appropriate spot fixes
this (wxGtk does toupper in this case already).

Applied patch [ 608530 ] wxX11 doesn't set argv[argc] to NULL

Olly Betts

The code which creates argv under wxX11 doesn't add a
terminating element with value NULL - user code which
expects this (it's true for C/C++ argv) will fail.

Here's a patch to correct this.

I've checked the other versions of app.cpp and they all
get this right.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17160 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/x11/window.cpp

@@ -1480,7 +1480,7 @@ bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win, Window WXUNUSED(win
             wxevent.m_altDown = XKeyEventAltIsDown(xevent);
             wxevent.m_metaDown = XKeyEventMetaIsDown(xevent);
             wxevent.SetEventObject(win);
-            wxevent.m_keyCode = id;
+            wxevent.m_keyCode = toupper(id);
             wxevent.SetTimestamp(XKeyEventGetTime(xevent));
 
             wxevent.m_x = XKeyEventGetX(xevent);