Move code into CommonTrackControls.cpp

src/tracks/labeltrack/ui/LabelTrackControls.h

@@ -11,7 +11,7 @@ Paul Licameli split from TrackPanel.cpp
 #ifndef __AUDACITY_LABEL_TRACK_CONTROLS__
 #define __AUDACITY_LABEL_TRACK_CONTROLS__
 
-#include "../../ui/TrackControls.h"
+#include "../../ui/CommonTrackControls.h" // to inherit
 
 class LabelTrackControls final : public CommonTrackControls
 {

src/tracks/playabletrack/notetrack/ui/NoteTrackControls.h

@@ -11,7 +11,8 @@ Paul Licameli split from TrackPanel.cpp
 #ifndef __AUDACITY_NOTE_TRACK_CONTROLS__
 #define __AUDACITY_NOTE_TRACK_CONTROLS__
 
-#include "../../../ui/TrackControls.h"
+#include "../../../ui/CommonTrackControls.h" // to inherit
+
 class MuteButtonHandle;
 class SoloButtonHandle;
 class NoteTrackButtonHandle;

src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.h

@@ -11,7 +11,7 @@ Paul Licameli split from TrackPanel.cpp
 #ifndef __AUDACITY_WAVE_TRACK_CONTROLS__
 #define __AUDACITY_WAVE_TRACK_CONTROLS__
 
-#include "../../../ui/TrackControls.h"
+#include "../../../ui/CommonTrackControls.h" // to inherit
 
 class MuteButtonHandle;
 class SoloButtonHandle;

src/tracks/timetrack/ui/TimeTrackControls.h

@@ -11,7 +11,7 @@ Paul Licameli split from TrackPanel.cpp
 #ifndef __AUDACITY_TIME_TRACK_CONTROLS__
 #define __AUDACITY_TIME_TRACK_CONTROLS__
 
-#include "../../ui/TrackControls.h"
+#include "../../ui/CommonTrackControls.h" // to inherit
 
 class TimeTrackControls final : public CommonTrackControls
 {

src/tracks/ui/CommonTrackControls.cpp

@@ -0,0 +1,271 @@
+/**********************************************************************
+
+Audacity: A Digital Audio Editor
+
+CommonTrackControls.cpp
+
+Paul Licameli split from TrackControls.cpp
+
+**********************************************************************/
+
+#include "CommonTrackControls.h"
+
+#include "TrackButtonHandles.h"
+#include "TrackSelectHandle.h"
+#include "../../RefreshCode.h"
+#include "../../Menus.h"
+#include "../../Project.h"
+#include "../../ProjectHistory.h"
+#include "../../TrackPanel.h" // for TrackInfo
+#include "../../TrackPanelMouseEvent.h"
+#include <wx/textdlg.h>
+#include "../../commands/CommandType.h"
+#include "../../commands/CommandManager.h"
+#include "../../ShuttleGui.h"
+#include "../../Track.h"
+#include "../../widgets/PopupMenuTable.h"
+
+#include <wx/frame.h>
+
+std::vector<UIHandlePtr> CommonTrackControls::HitTest
+(const TrackPanelMouseState &st,
+ const AudacityProject *WXUNUSED(project))
+{
+   // Hits are mutually exclusive, results single
+
+   const wxMouseState &state = st.state;
+   const wxRect &rect = st.rect;
+   UIHandlePtr result;
+   std::vector<UIHandlePtr> results;
+
+   auto pTrack = FindTrack();
+   // shared pointer to this:
+   auto sThis =
+      std::static_pointer_cast<TrackControls>( pTrack->GetTrackControl() );
+   wxASSERT( this == sThis.get() );
+
+   if (NULL != (result = CloseButtonHandle::HitTest(
+      mCloseHandle, state, rect, this)))
+      results.push_back(result);
+
+   if (NULL != (result = MenuButtonHandle::HitTest(
+      mMenuHandle, state, rect, sThis)))
+      results.push_back(result);
+
+   if (NULL != (result = MinimizeButtonHandle::HitTest(
+      mMinimizeHandle, state, rect, this)))
+      results.push_back(result);
+
+   if (NULL != (result = SelectButtonHandle::HitTest(
+      mSelectButtonHandle, state, rect, this)))
+      results.push_back(result);
+
+   if (results.empty()) {
+      if (NULL != (result = TrackSelectHandle::HitAnywhere(
+         mSelectHandle, pTrack)))
+         results.push_back(result);
+   }
+
+   return results;
+}
+
+enum
+{
+   OnSetNameID = 2000,
+   OnMoveUpID,
+   OnMoveDownID,
+   OnMoveTopID,
+   OnMoveBottomID,
+};
+
+class TrackMenuTable : public PopupMenuTable
+{
+   TrackMenuTable() : mpData(NULL) {}
+   DECLARE_POPUP_MENU(TrackMenuTable);
+
+public:
+   static TrackMenuTable &Instance();
+
+private:
+   void OnSetName(wxCommandEvent &);
+   void OnMoveTrack(wxCommandEvent &event);
+
+   void InitMenu(Menu *pMenu, void *pUserData) override;
+
+   void DestroyMenu() override
+   {
+      mpData = nullptr;
+   }
+
+   CommonTrackControls::InitMenuData *mpData;
+};
+
+TrackMenuTable &TrackMenuTable::Instance()
+{
+   static TrackMenuTable instance;
+   return instance;
+}
+
+void TrackMenuTable::InitMenu(Menu *pMenu, void *pUserData)
+{
+   mpData = static_cast<CommonTrackControls::InitMenuData*>(pUserData);
+   Track *const pTrack = mpData->pTrack;
+
+   const auto &tracks = TrackList::Get( *GetActiveProject() );
+
+   pMenu->Enable(OnMoveUpID, tracks.CanMoveUp(pTrack));
+   pMenu->Enable(OnMoveDownID, tracks.CanMoveDown(pTrack));
+   pMenu->Enable(OnMoveTopID, tracks.CanMoveUp(pTrack));
+   pMenu->Enable(OnMoveBottomID, tracks.CanMoveDown(pTrack));
+}
+
+BEGIN_POPUP_MENU(TrackMenuTable)
+   POPUP_MENU_ITEM(OnSetNameID, _("&Name..."), OnSetName)
+   POPUP_MENU_SEPARATOR()
+   POPUP_MENU_ITEM(
+      // It is not correct to use NormalizedKeyString::Display here --
+      // wxWidgets will apply its equivalent to the key names passed to menu
+      // functions.
+      OnMoveUpID,
+      _("Move Track &Up") + wxT("\t") +
+         (CommandManager::Get( *GetActiveProject() ).
+          // using GET to compose menu item name for wxWidgets
+          GetKeyFromName(wxT("TrackMoveUp")).GET()),
+      OnMoveTrack)
+   POPUP_MENU_ITEM(
+      OnMoveDownID,
+      _("Move Track &Down") + wxT("\t") +
+         (CommandManager::Get( *GetActiveProject() ).
+          // using GET to compose menu item name for wxWidgets
+          GetKeyFromName(wxT("TrackMoveDown")).GET()),
+      OnMoveTrack)
+   POPUP_MENU_ITEM(
+      OnMoveTopID,
+      _("Move Track to &Top") + wxT("\t") +
+         (CommandManager::Get( *GetActiveProject() ).
+          // using GET to compose menu item name for wxWidgets
+          GetKeyFromName(wxT("TrackMoveTop")).GET()),
+      OnMoveTrack)
+   POPUP_MENU_ITEM(
+      OnMoveBottomID,
+      _("Move Track to &Bottom") + wxT("\t") +
+         (CommandManager::Get( *GetActiveProject() ).
+          // using GET to compose menu item name for wxWidgets
+          GetKeyFromName(wxT("TrackMoveBottom")).GET()),
+      OnMoveTrack)
+END_POPUP_MENU()
+
+
+
+
+#define SET_TRACK_NAME_PLUGIN_SYMBOL ComponentInterfaceSymbol{ XO("Set Track Name") }
+
+// An example of using an AudacityCommand simply to create a dialog.
+// We can add additional functions later, if we want to make it
+// available to scripting.
+// However there is no reason to, as SetTrackStatus is already provided.
+class SetTrackNameCommand : public AudacityCommand
+{
+public:
+   // ComponentInterface overrides
+   ComponentInterfaceSymbol GetSymbol() override
+   {return SET_TRACK_NAME_PLUGIN_SYMBOL;};
+   //wxString GetDescription() override {return _("Sets the track name.");};
+   //bool DefineParams( ShuttleParams & S ) override;
+   void PopulateOrExchange(ShuttleGui & S) override;
+   //bool Apply(const CommandContext & context) override;
+
+   // Provide an override, if we want the help button.
+   // wxString ManualPage() override {return wxT("");};
+public:
+   wxString mName;
+};
+
+void SetTrackNameCommand::PopulateOrExchange(ShuttleGui & S)
+{
+   S.AddSpace(0, 5);
+
+   S.StartMultiColumn(2, wxALIGN_CENTER);
+   {
+      S.TieTextBox(_("Name:"),mName,60);
+   }
+   S.EndMultiColumn();
+}
+
+void TrackMenuTable::OnSetName(wxCommandEvent &)
+{
+   Track *const pTrack = mpData->pTrack;
+   if (pTrack)
+   {
+      AudacityProject *const proj = ::GetActiveProject();
+      const wxString oldName = pTrack->GetName();
+
+      SetTrackNameCommand Command;
+      Command.mName = oldName;
+      // Bug 1837 : We need an OK/Cancel result if we are to enter a blank string.
+      bool bResult = Command.PromptUser( &GetProjectFrame( *proj ) );
+      if (bResult) 
+      {
+         wxString newName = Command.mName;
+         for (auto channel : TrackList::Channels(pTrack))
+            channel->SetName(newName);
+
+         ProjectHistory::Get( *proj )
+            .PushState(wxString::Format(_("Renamed '%s' to '%s'"),
+            oldName,
+            newName),
+            _("Name Change"));
+
+         mpData->result = RefreshCode::RefreshAll;
+      }
+   }
+}
+
+void TrackMenuTable::OnMoveTrack(wxCommandEvent &event)
+{
+   AudacityProject *const project = GetActiveProject();
+   TrackActions::MoveChoice choice;
+   switch (event.GetId()) {
+   default:
+      wxASSERT(false);
+   case OnMoveUpID:
+      choice = TrackActions::OnMoveUpID; break;
+   case OnMoveDownID:
+      choice = TrackActions::OnMoveDownID; break;
+   case OnMoveTopID:
+      choice = TrackActions::OnMoveTopID; break;
+   case OnMoveBottomID:
+      choice = TrackActions::OnMoveBottomID; break;
+   }
+
+   TrackActions::DoMoveTrack(*project, mpData->pTrack, choice);
+
+   // MoveTrack already refreshed TrackPanel, which means repaint will happen.
+   // This is a harmless redundancy:
+   mpData->result = RefreshCode::RefreshAll;
+}
+
+unsigned CommonTrackControls::DoContextMenu
+   (const wxRect &rect, wxWindow *pParent, wxPoint *)
+{
+   wxRect buttonRect;
+   TrackInfo::GetTitleBarRect(rect, buttonRect);
+
+   auto track = FindTrack();
+   if (!track)
+      return RefreshCode::RefreshNone;
+
+   InitMenuData data{ track.get(), pParent, RefreshCode::RefreshNone };
+
+   const auto pTable = &TrackMenuTable::Instance();
+   auto pMenu = PopupMenuTable::BuildMenu(pParent, pTable, &data);
+
+   PopupMenuTable *const pExtension = GetMenuExtension(track.get());
+   if (pExtension)
+      pMenu->Extend(pExtension);
+
+   pParent->PopupMenu
+      (pMenu.get(), buttonRect.x + 1, buttonRect.y + buttonRect.height + 1);
+
+   return data.result;
+}

src/tracks/ui/CommonTrackControls.h

@@ -0,0 +1,56 @@
+/**********************************************************************
+
+Audacity: A Digital Audio Editor
+
+CommonTrackControls.h
+
+Paul Licameli split from TrackControls.h
+
+**********************************************************************/
+
+#ifndef __AUDACITY_COMMON_TRACK_CONTROLS__
+#define __AUDACITY_COMMON_TRACK_CONTROLS__
+
+#include "TrackControls.h" // to inherit
+
+class CloseButtonHandle;
+class MenuButtonHandle;
+class PopupMenuTable;
+class MinimizeButtonHandle;
+class SelectButtonHandle;
+class TrackSelectHandle;
+
+class CommonTrackControls /* not final */ : public TrackControls
+{
+public:
+   using TrackControls::TrackControls;
+
+   // This is passed to the InitMenu() methods of the PopupMenuTable
+   // objects returned by GetMenuExtension:
+   struct InitMenuData
+   {
+   public:
+      Track *pTrack;
+      wxWindow *pParent;
+      unsigned result;
+   };
+
+protected:
+   // An override is supplied for derived classes to call through but it is
+   // still marked pure virtual
+   virtual std::vector<UIHandlePtr> HitTest
+      (const TrackPanelMouseState &state,
+       const AudacityProject *) override = 0;
+
+   unsigned DoContextMenu
+      (const wxRect &rect, wxWindow *pParent, wxPoint *pPosition) override;
+   virtual PopupMenuTable *GetMenuExtension(Track *pTrack) = 0;
+
+   std::weak_ptr<CloseButtonHandle> mCloseHandle;
+   std::weak_ptr<MenuButtonHandle> mMenuHandle;
+   std::weak_ptr<MinimizeButtonHandle> mMinimizeHandle;
+   std::weak_ptr<SelectButtonHandle> mSelectButtonHandle;
+   std::weak_ptr<TrackSelectHandle> mSelectHandle;
+};
+
+#endif

src/tracks/ui/TrackControls.cpp

@@ -11,23 +11,6 @@ Paul Licameli split from TrackPanel.cpp
 #include "../../Audacity.h"
 #include "TrackControls.h"
 
-#include "TrackButtonHandles.h"
-#include "TrackSelectHandle.h"
-#include "../../RefreshCode.h"
-#include "../../Menus.h"
-#include "../../Project.h"
-#include "../../ProjectHistory.h"
-#include "../../TrackPanel.h" // for TrackInfo
-#include "../../TrackPanelMouseEvent.h"
-#include <wx/textdlg.h>
-#include "../../commands/CommandType.h"
-#include "../../commands/CommandManager.h"
-#include "../../ShuttleGui.h"
-#include "../../Track.h"
-#include "../../widgets/PopupMenuTable.h"
-
-#include <wx/frame.h>
-
 TrackControls::TrackControls( std::shared_ptr<Track> pTrack )
    : CommonTrackCell{ pTrack }
 {
@@ -36,246 +19,3 @@ TrackControls::TrackControls( std::shared_ptr<Track> pTrack )
 TrackControls::~TrackControls()
 {
 }
-
-std::vector<UIHandlePtr> CommonTrackControls::HitTest
-(const TrackPanelMouseState &st,
- const AudacityProject *WXUNUSED(project))
-{
-   // Hits are mutually exclusive, results single
-
-   const wxMouseState &state = st.state;
-   const wxRect &rect = st.rect;
-   UIHandlePtr result;
-   std::vector<UIHandlePtr> results;
-
-   auto pTrack = FindTrack();
-   // shared pointer to this:
-   auto sThis =
-      std::static_pointer_cast<TrackControls>( pTrack->GetTrackControl() );
-   wxASSERT( this == sThis.get() );
-
-   if (NULL != (result = CloseButtonHandle::HitTest(
-      mCloseHandle, state, rect, this)))
-      results.push_back(result);
-
-   if (NULL != (result = MenuButtonHandle::HitTest(
-      mMenuHandle, state, rect, sThis)))
-      results.push_back(result);
-
-   if (NULL != (result = MinimizeButtonHandle::HitTest(
-      mMinimizeHandle, state, rect, this)))
-      results.push_back(result);
-
-   if (NULL != (result = SelectButtonHandle::HitTest(
-      mSelectButtonHandle, state, rect, this)))
-      results.push_back(result);
-
-   if (results.empty()) {
-      if (NULL != (result = TrackSelectHandle::HitAnywhere(
-         mSelectHandle, pTrack)))
-         results.push_back(result);
-   }
-
-   return results;
-}
-
-enum
-{
-   OnSetNameID = 2000,
-   OnMoveUpID,
-   OnMoveDownID,
-   OnMoveTopID,
-   OnMoveBottomID,
-};
-
-class TrackMenuTable : public PopupMenuTable
-{
-   TrackMenuTable() : mpData(NULL) {}
-   DECLARE_POPUP_MENU(TrackMenuTable);
-
-public:
-   static TrackMenuTable &Instance();
-
-private:
-   void OnSetName(wxCommandEvent &);
-   void OnMoveTrack(wxCommandEvent &event);
-
-   void InitMenu(Menu *pMenu, void *pUserData) override;
-
-   void DestroyMenu() override
-   {
-      mpData = nullptr;
-   }
-
-   CommonTrackControls::InitMenuData *mpData;
-};
-
-TrackMenuTable &TrackMenuTable::Instance()
-{
-   static TrackMenuTable instance;
-   return instance;
-}
-
-void TrackMenuTable::InitMenu(Menu *pMenu, void *pUserData)
-{
-   mpData = static_cast<CommonTrackControls::InitMenuData*>(pUserData);
-   Track *const pTrack = mpData->pTrack;
-
-   const auto &tracks = TrackList::Get( *GetActiveProject() );
-
-   pMenu->Enable(OnMoveUpID, tracks.CanMoveUp(pTrack));
-   pMenu->Enable(OnMoveDownID, tracks.CanMoveDown(pTrack));
-   pMenu->Enable(OnMoveTopID, tracks.CanMoveUp(pTrack));
-   pMenu->Enable(OnMoveBottomID, tracks.CanMoveDown(pTrack));
-}
-
-BEGIN_POPUP_MENU(TrackMenuTable)
-   POPUP_MENU_ITEM(OnSetNameID, _("&Name..."), OnSetName)
-   POPUP_MENU_SEPARATOR()
-   POPUP_MENU_ITEM(
-      // It is not correct to use NormalizedKeyString::Display here --
-      // wxWidgets will apply its equivalent to the key names passed to menu
-      // functions.
-      OnMoveUpID,
-      _("Move Track &Up") + wxT("\t") +
-         (CommandManager::Get( *GetActiveProject() ).
-          // using GET to compose menu item name for wxWidgets
-          GetKeyFromName(wxT("TrackMoveUp")).GET()),
-      OnMoveTrack)
-   POPUP_MENU_ITEM(
-      OnMoveDownID,
-      _("Move Track &Down") + wxT("\t") +
-         (CommandManager::Get( *GetActiveProject() ).
-          // using GET to compose menu item name for wxWidgets
-          GetKeyFromName(wxT("TrackMoveDown")).GET()),
-      OnMoveTrack)
-   POPUP_MENU_ITEM(
-      OnMoveTopID,
-      _("Move Track to &Top") + wxT("\t") +
-         (CommandManager::Get( *GetActiveProject() ).
-          // using GET to compose menu item name for wxWidgets
-          GetKeyFromName(wxT("TrackMoveTop")).GET()),
-      OnMoveTrack)
-   POPUP_MENU_ITEM(
-      OnMoveBottomID,
-      _("Move Track to &Bottom") + wxT("\t") +
-         (CommandManager::Get( *GetActiveProject() ).
-          // using GET to compose menu item name for wxWidgets
-          GetKeyFromName(wxT("TrackMoveBottom")).GET()),
-      OnMoveTrack)
-END_POPUP_MENU()
-
-
-
-
-#define SET_TRACK_NAME_PLUGIN_SYMBOL ComponentInterfaceSymbol{ XO("Set Track Name") }
-
-// An example of using an AudacityCommand simply to create a dialog.
-// We can add additional functions later, if we want to make it
-// available to scripting.
-// However there is no reason to, as SetTrackStatus is already provided.
-class SetTrackNameCommand : public AudacityCommand
-{
-public:
-   // ComponentInterface overrides
-   ComponentInterfaceSymbol GetSymbol() override
-   {return SET_TRACK_NAME_PLUGIN_SYMBOL;};
-   //wxString GetDescription() override {return _("Sets the track name.");};
-   //bool DefineParams( ShuttleParams & S ) override;
-   void PopulateOrExchange(ShuttleGui & S) override;
-   //bool Apply(const CommandContext & context) override;
-
-   // Provide an override, if we want the help button.
-   // wxString ManualPage() override {return wxT("");};
-public:
-   wxString mName;
-};
-
-void SetTrackNameCommand::PopulateOrExchange(ShuttleGui & S)
-{
-   S.AddSpace(0, 5);
-
-   S.StartMultiColumn(2, wxALIGN_CENTER);
-   {
-      S.TieTextBox(_("Name:"),mName,60);
-   }
-   S.EndMultiColumn();
-}
-
-void TrackMenuTable::OnSetName(wxCommandEvent &)
-{
-   Track *const pTrack = mpData->pTrack;
-   if (pTrack)
-   {
-      AudacityProject *const proj = ::GetActiveProject();
-      const wxString oldName = pTrack->GetName();
-
-      SetTrackNameCommand Command;
-      Command.mName = oldName;
-      // Bug 1837 : We need an OK/Cancel result if we are to enter a blank string.
-      bool bResult = Command.PromptUser( &GetProjectFrame( *proj ) );
-      if (bResult) 
-      {
-         wxString newName = Command.mName;
-         for (auto channel : TrackList::Channels(pTrack))
-            channel->SetName(newName);
-
-         ProjectHistory::Get( *proj )
-            .PushState(wxString::Format(_("Renamed '%s' to '%s'"),
-            oldName,
-            newName),
-            _("Name Change"));
-
-         mpData->result = RefreshCode::RefreshAll;
-      }
-   }
-}
-
-void TrackMenuTable::OnMoveTrack(wxCommandEvent &event)
-{
-   AudacityProject *const project = GetActiveProject();
-   TrackActions::MoveChoice choice;
-   switch (event.GetId()) {
-   default:
-      wxASSERT(false);
-   case OnMoveUpID:
-      choice = TrackActions::OnMoveUpID; break;
-   case OnMoveDownID:
-      choice = TrackActions::OnMoveDownID; break;
-   case OnMoveTopID:
-      choice = TrackActions::OnMoveTopID; break;
-   case OnMoveBottomID:
-      choice = TrackActions::OnMoveBottomID; break;
-   }
-
-   TrackActions::DoMoveTrack(*project, mpData->pTrack, choice);
-
-   // MoveTrack already refreshed TrackPanel, which means repaint will happen.
-   // This is a harmless redundancy:
-   mpData->result = RefreshCode::RefreshAll;
-}
-
-unsigned CommonTrackControls::DoContextMenu
-   (const wxRect &rect, wxWindow *pParent, wxPoint *)
-{
-   wxRect buttonRect;
-   TrackInfo::GetTitleBarRect(rect, buttonRect);
-
-   auto track = FindTrack();
-   if (!track)
-      return RefreshCode::RefreshNone;
-
-   InitMenuData data{ track.get(), pParent, RefreshCode::RefreshNone };
-
-   const auto pTable = &TrackMenuTable::Instance();
-   auto pMenu = PopupMenuTable::BuildMenu(pParent, pTable, &data);
-
-   PopupMenuTable *const pExtension = GetMenuExtension(track.get());
-   if (pExtension)
-      pMenu->Extend(pExtension);
-
-   pParent->PopupMenu
-      (pMenu.get(), buttonRect.x + 1, buttonRect.y + buttonRect.height + 1);
-
-   return data.result;
-}

src/tracks/ui/TrackControls.h

@@ -13,15 +13,8 @@ Paul Licameli split from TrackPanel.cpp
 
 #include "CommonTrackPanelCell.h"
 
-class PopupMenuTable;
 class Track;
 
-class CloseButtonHandle;
-class MenuButtonHandle;
-class MinimizeButtonHandle;
-class SelectButtonHandle;
-class TrackSelectHandle;
-
 class TrackControls /* not final */ : public CommonTrackCell
 {
 public:
@@ -31,37 +24,4 @@ public:
    virtual ~TrackControls() = 0;
 };
 
-class CommonTrackControls /* not final */ : public TrackControls
-{
-public:
-   using TrackControls::TrackControls;
-
-   // This is passed to the InitMenu() methods of the PopupMenuTable
-   // objects returned by GetMenuExtension:
-   struct InitMenuData
-   {
-   public:
-      Track *pTrack;
-      wxWindow *pParent;
-      unsigned result;
-   };
-
-protected:
-   // An override is supplied for derived classes to call through but it is
-   // still marked pure virtual
-   virtual std::vector<UIHandlePtr> HitTest
-      (const TrackPanelMouseState &state,
-       const AudacityProject *) override = 0;
-
-   unsigned DoContextMenu
-      (const wxRect &rect, wxWindow *pParent, wxPoint *pPosition) override;
-   virtual PopupMenuTable *GetMenuExtension(Track *pTrack) = 0;
-
-   std::weak_ptr<CloseButtonHandle> mCloseHandle;
-   std::weak_ptr<MenuButtonHandle> mMenuHandle;
-   std::weak_ptr<MinimizeButtonHandle> mMinimizeHandle;
-   std::weak_ptr<SelectButtonHandle> mSelectButtonHandle;
-   std::weak_ptr<TrackSelectHandle> mSelectHandle;
-};
-
 #endif