mirror of
https://github.com/cookiengineer/audacity
synced 2025-08-03 17:39:25 +02:00
CellularPanel passes AudacityProject* to DoContextMenu() of cell
This commit is contained in:
parent
12bbafe013
commit
7dbca958a6
@ -430,7 +430,7 @@ public:
|
|||||||
|
|
||||||
unsigned DoContextMenu
|
unsigned DoContextMenu
|
||||||
(const wxRect &rect,
|
(const wxRect &rect,
|
||||||
wxWindow *pParent, wxPoint *pPosition) final override
|
wxWindow *pParent, wxPoint *pPosition, AudacityProject*) final override
|
||||||
{
|
{
|
||||||
(void)pParent;// Compiler food
|
(void)pParent;// Compiler food
|
||||||
(void)rect;// Compiler food
|
(void)rect;// Compiler food
|
||||||
|
@ -877,7 +877,7 @@ void CellularPanel::DoContextMenu( TrackPanelCell *pCell )
|
|||||||
|
|
||||||
auto rect = FindRect( *delegate );
|
auto rect = FindRect( *delegate );
|
||||||
const UIHandle::Result refreshResult =
|
const UIHandle::Result refreshResult =
|
||||||
delegate->DoContextMenu(rect, this, NULL);
|
delegate->DoContextMenu(rect, this, nullptr, GetProject());
|
||||||
|
|
||||||
// To do: use safer shared_ptr to pCell
|
// To do: use safer shared_ptr to pCell
|
||||||
ProcessUIHandleResult(pCell, pCell, refreshResult);
|
ProcessUIHandleResult(pCell, pCell, refreshResult);
|
||||||
|
@ -1597,7 +1597,7 @@ unsigned TrackPanelCell::HandleWheelRotation
|
|||||||
}
|
}
|
||||||
|
|
||||||
unsigned TrackPanelCell::DoContextMenu
|
unsigned TrackPanelCell::DoContextMenu
|
||||||
(const wxRect &, wxWindow*, wxPoint *)
|
(const wxRect &, wxWindow*, wxPoint *, AudacityProject*)
|
||||||
{
|
{
|
||||||
return RefreshCode::RefreshNone;
|
return RefreshCode::RefreshNone;
|
||||||
}
|
}
|
||||||
|
@ -109,7 +109,7 @@ public:
|
|||||||
// Default implementation does nothing
|
// Default implementation does nothing
|
||||||
virtual unsigned DoContextMenu
|
virtual unsigned DoContextMenu
|
||||||
(const wxRect &rect,
|
(const wxRect &rect,
|
||||||
wxWindow *pParent, wxPoint *pPosition);
|
wxWindow *pParent, wxPoint *pPosition, AudacityProject *pProject);
|
||||||
|
|
||||||
// Return value is a bitwise OR of RefreshCode values
|
// Return value is a bitwise OR of RefreshCode values
|
||||||
// Default skips the event and does nothing
|
// Default skips the event and does nothing
|
||||||
|
@ -262,7 +262,7 @@ void TrackMenuTable::OnMoveTrack(wxCommandEvent &event)
|
|||||||
}
|
}
|
||||||
|
|
||||||
unsigned CommonTrackControls::DoContextMenu
|
unsigned CommonTrackControls::DoContextMenu
|
||||||
(const wxRect &rect, wxWindow *pParent, wxPoint *)
|
(const wxRect &rect, wxWindow *pParent, wxPoint *, AudacityProject*)
|
||||||
{
|
{
|
||||||
wxRect buttonRect;
|
wxRect buttonRect;
|
||||||
TrackInfo::GetTitleBarRect(rect, buttonRect);
|
TrackInfo::GetTitleBarRect(rect, buttonRect);
|
||||||
|
@ -53,7 +53,8 @@ protected:
|
|||||||
const AudacityProject *) override = 0;
|
const AudacityProject *) override = 0;
|
||||||
|
|
||||||
unsigned DoContextMenu
|
unsigned DoContextMenu
|
||||||
(const wxRect &rect, wxWindow *pParent, wxPoint *pPosition) override;
|
(const wxRect &rect, wxWindow *pParent, wxPoint *pPosition,
|
||||||
|
AudacityProject *pProject) override;
|
||||||
virtual PopupMenuTable *GetMenuExtension(Track *pTrack) = 0;
|
virtual PopupMenuTable *GetMenuExtension(Track *pTrack) = 0;
|
||||||
|
|
||||||
// TrackPanelDrawable implementation
|
// TrackPanelDrawable implementation
|
||||||
|
Loading…
x
Reference in New Issue
Block a user