mirror of
https://github.com/cookiengineer/audacity
synced 2025-05-02 00:29:41 +02:00
Fixed duplicate definition of SliderAx. Now it's only defined in Equalization and shared from there.
This commit is contained in:
parent
91d241419e
commit
d3ff41e025
@ -40,6 +40,7 @@ a graph for EffectScienFilter.
|
||||
|
||||
#include "../Audacity.h"
|
||||
#include "ScienFilter.h"
|
||||
#include "Equalization.h" // For SliderAx
|
||||
#include "../AColor.h"
|
||||
#include "../ShuttleGui.h"
|
||||
#include "../PlatformCompatibility.h"
|
||||
|
@ -255,75 +255,9 @@ private:
|
||||
|
||||
#if wxUSE_ACCESSIBILITY
|
||||
|
||||
class SliderAx: public wxWindowAccessible
|
||||
{
|
||||
public:
|
||||
SliderAx(wxWindow * window, wxString fmt);
|
||||
|
||||
virtual ~ SliderAx();
|
||||
|
||||
// Retrieves the address of an IDispatch interface for the specified child.
|
||||
// All objects must support this property.
|
||||
virtual wxAccStatus GetChild( int childId, wxAccessible** child );
|
||||
|
||||
// Gets the number of children.
|
||||
virtual wxAccStatus GetChildCount(int* childCount);
|
||||
|
||||
// Gets the default action for this object (0) or > 0 (the action for a child).
|
||||
// Return wxACC_OK even if there is no action. actionName is the action, or the empty
|
||||
// string if there is no action.
|
||||
// The retrieved string describes the action that is performed on an object,
|
||||
// not what the object does as a result. For example, a toolbar button that prints
|
||||
// a document has a default action of "Press" rather than "Prints the current document."
|
||||
virtual wxAccStatus GetDefaultAction( int childId, wxString *actionName );
|
||||
|
||||
// Returns the description for this object or a child.
|
||||
virtual wxAccStatus GetDescription( int childId, wxString *description );
|
||||
|
||||
// Gets the window with the keyboard focus.
|
||||
// If childId is 0 and child is NULL, no object in
|
||||
// this subhierarchy has the focus.
|
||||
// If this object has the focus, child should be 'this'.
|
||||
virtual wxAccStatus GetFocus( int *childId, wxAccessible **child );
|
||||
|
||||
// Returns help text for this object or a child, similar to tooltip text.
|
||||
virtual wxAccStatus GetHelpText( int childId, wxString *helpText );
|
||||
|
||||
// Returns the keyboard shortcut for this object or child.
|
||||
// Return e.g. ALT+K
|
||||
virtual wxAccStatus GetKeyboardShortcut( int childId, wxString *shortcut );
|
||||
|
||||
// Returns the rectangle for this object (id = 0) or a child element (id > 0).
|
||||
// rect is in screen coordinates.
|
||||
virtual wxAccStatus GetLocation( wxRect& rect, int elementId );
|
||||
|
||||
// Gets the name of the specified object.
|
||||
virtual wxAccStatus GetName( int childId, wxString *name );
|
||||
|
||||
// Returns a role constant.
|
||||
virtual wxAccStatus GetRole( int childId, wxAccRole *role );
|
||||
|
||||
// Gets a variant representing the selected children
|
||||
// of this object.
|
||||
// Acceptable values:
|
||||
// - a null variant (IsNull() returns TRUE)
|
||||
// - a list variant (GetType() == wxT("list"))
|
||||
// - an integer representing the selected child element,
|
||||
// or 0 if this object is selected (GetType() == wxT("long"))
|
||||
// - a "void*" pointer to a wxAccessible child object
|
||||
virtual wxAccStatus GetSelections( wxVariant *selections );
|
||||
|
||||
// Returns a state constant.
|
||||
virtual wxAccStatus GetState(int childId, long* state);
|
||||
|
||||
// Returns a localized string representing the value for the object
|
||||
// or child.
|
||||
virtual wxAccStatus GetValue(int childId, wxString* strValue);
|
||||
|
||||
private:
|
||||
wxWindow *mParent;
|
||||
wxString mFmt;
|
||||
};
|
||||
// ScienceFilter and Equalisation effects both need SliderAx class.
|
||||
// For now it is declared and defined in Equalisation effect.
|
||||
// TODO: Move it to its own file.
|
||||
|
||||
#endif // wxUSE_ACCESSIBILITY
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user