Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-16 08:09:32 +02:00
Code Issues Releases Wiki Activity

David Bailes patch for bug 33

Browse Source
This commit is contained in:
v.audacity 2012-10-05 23:35:56 +00:00
parent b53669ad3d
commit 532e9d9518
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/widgets/AButton.cpp
View File

@ -93,7 +93,11 @@ void AButton::Init(wxWindow * parent,
ImageRoll dis, ImageRoll dis,
bool toggle) bool toggle)
{ {
Create(parent, id, pos, size); // Bug in wxWidgets 2.8.12: by default pressing Enter on an AButton is interpreted as
// a navigation event - move to next control. As a workaround, the style wxWANTS_CHARS
// results in all characters being available in the OnKeyDown function below. Note
// that OnKeyDown now has to handle navigation.
Create(parent, id, pos, size, wxWANTS_CHARS);
mWasShiftDown = false; mWasShiftDown = false;
mWasControlDown = false; mWasControlDown = false;
@ -316,18 +320,33 @@ void AButton::OnCaptureLost(wxMouseCaptureLostEvent & event)
OnMouseEvent(e); OnMouseEvent(e);
} }
// Note that OnKeyDown has to handle navigation because wxWANTS_CHARS
// flag was set - see above.
void AButton::OnKeyDown(wxKeyEvent & event) void AButton::OnKeyDown(wxKeyEvent & event)
{ {
switch( event.GetKeyCode() ) switch( event.GetKeyCode() )
{ {
case WXK_RETURN: case WXK_RIGHT:
mWasShiftDown = event.ShiftDown(); Navigate();
mWasControlDown = event.ControlDown();
Click();
break; break;
case WXK_LEFT:
Navigate(wxNavigationKeyEvent::IsBackward);
break;
case WXK_TAB:
if (event.ShiftDown())
Navigate(wxNavigationKeyEvent::IsBackward);
else
Navigate();
break;
case WXK_RETURN:
case WXK_NUMPAD_ENTER:
mWasShiftDown = event.ShiftDown();
mWasControlDown = event.ControlDown();
Click();
break;
default:
event.Skip();
} }
event.Skip();
} }
void AButton::OnSetFocus(wxFocusEvent & event) void AButton::OnSetFocus(wxFocusEvent & event)