Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix assert in the text sample when logging char events

Browse Source 
Passing long argument to "%c" printf format specifier was correctly
flagged as invalid in 64 bit Unix builds where long != int.

Fix this by just making the "keycode" variable int in the first place,
there doesn't seem to be any reason whatsoever for it to be long and
this allows us to get rid of a couple of existing casts instead of
adding yet another one.
This commit is contained in:
Vadim Zeitlin
2017-08-24 14:17:33 +02:00
parent 8c572c0a77
commit 741dd542f2
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
samples/text/text.cpp
View File

@@ -588,7 +588,7 @@ bool MyTextCtrl::ms_logClip = false;
void MyTextCtrl::LogKeyEvent(const wxChar *name, wxKeyEvent& event) const
{
wxString key;
long keycode = event.GetKeyCode();
const int keycode = event.GetKeyCode();
{
switch ( keycode )
{
@@ -710,12 +710,12 @@ void MyTextCtrl::LogKeyEvent(const wxChar *name, wxKeyEvent& event) const
default:
{
if ( wxIsprint((int)keycode) )
key.Printf(wxT("'%c'"), (char)keycode);
if ( wxIsprint(keycode) )
key.Printf(wxT("'%c'"), keycode);
else if ( keycode > 0 && keycode < 27 )
key.Printf(_("Ctrl-%c"), wxT('A') + keycode - 1);
else
key.Printf(wxT("unknown (%ld)"), keycode);
key.Printf(wxT("unknown (%d)"), keycode);
}
}
}