1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-03 09:29:30 +02:00

CellularPanel passes AudacityProject* to DoContextMenu() of cell

This commit is contained in:
Paul Licameli 2020-01-01 21:57:39 -05:00
parent 12bbafe013
commit 7dbca958a6
6 changed files with 7 additions and 6 deletions

View File

@ -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

View File

@ -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);

View File

@ -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;
} }

View File

@ -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

View File

@ -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);

View File

@ -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