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

Revert "Make tool bar pushbuttons cooperate with Voiceover on Mac..."

Browse Source 
This reverts commit acde3d615292a7401597246608596517d7664475.
This commit is contained in:
Paul Licameli 2016-07-01 17:35:50 -04:00
parent 673aecf05d
commit dab59cb79d
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/widgets/AButton.cpp
View File

@ -35,7 +35,7 @@
#include "../Project.h"
#include <wx/tooltip.h>
BEGIN_EVENT_TABLE(AButton, wxButton)
BEGIN_EVENT_TABLE(AButton, wxWindow)
EVT_MOUSE_EVENTS(AButton::OnMouseEvent)
EVT_MOUSE_CAPTURE_LOST(AButton::OnCaptureLost)
EVT_KEY_DOWN(AButton::OnKeyDown)
@ -161,7 +161,7 @@ AButton::AButton(wxWindow * parent,
wxImage down,
wxImage dis,
bool toggle):
wxButton()
wxWindow()
{
Init(parent, id, pos, size,
ImageRoll(up), ImageRoll(over),
@ -178,7 +178,7 @@ AButton::AButton(wxWindow * parent,
ImageRoll down,
ImageRoll dis,
bool toggle):
wxButton()
wxWindow()
{
Init(parent, id, pos, size,
up, over, down, dis,
@ -205,7 +205,7 @@ void AButton::Init(wxWindow * parent,
// 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, wxEmptyString, pos, size, wxWANTS_CHARS | wxBORDER_NONE);
Create(parent, id, pos, size, wxWANTS_CHARS);
mWasShiftDown = false;
mWasControlDown = false;

3
src/widgets/AButton.h
View File

@ -19,13 +19,12 @@
#include <wx/access.h>
#endif
#include <wx/button.h>
#include <wx/image.h>
#include <wx/window.h>
#include "ImageRoll.h"
class AButton final : public wxButton {
class AButton final : public wxWindow {
friend class AButtonAx;
class Listener;