Remove unused code related to opening new windows from menu

Author: EvenAR

ILS_Window_Plugin/IWWindow.cpp

@@ -14,7 +14,6 @@
 #define MENU_ITEM_CLOSE                     10003
 #define MENU_ITEM_TOGGLE_THEME              10004
 #define MENU_ITEM_PROCEDURES_SEL_START      20000
-#define MENU_ITEM_PROCEDURES_NEW_START      30000
 
 BEGIN_MESSAGE_MAP(IWWindow, CWnd)
     ON_WM_LBUTTONDOWN()
@@ -39,7 +38,6 @@ BEGIN_MESSAGE_MAP(IWWindow, CWnd)
     ON_COMMAND_EX(MENU_ITEM_CLOSE, &IWWindow::OnMenuOptionSelected)
     ON_COMMAND_EX(MENU_ITEM_TOGGLE_THEME, &IWWindow::OnMenuOptionSelected)
     ON_COMMAND_RANGE(MENU_ITEM_PROCEDURES_SEL_START, MENU_ITEM_PROCEDURES_SEL_START + MAX_PROCEDURES, &IWWindow::OnProcedureSelected)
-    ON_COMMAND_RANGE(MENU_ITEM_PROCEDURES_NEW_START, MENU_ITEM_PROCEDURES_NEW_START + MAX_PROCEDURES, &IWWindow::OnProcedureSelected)
 END_MESSAGE_MAP()
 
 IWWindow::IWWindow(IWApproachDefinition selectedApproach, IWStyling styling, int titleBarHeight, int windowBorderThickness, int windowOuterBorderThickness)
@@ -364,9 +362,7 @@ void IWWindow::CreatePopupMenu(CPoint point)
 
     // Submenus
     auto subMenuSelect = std::make_unique<CMenu>();
-    auto subMenuOpenNew = std::make_unique<CMenu>();
     subMenuSelect->CreatePopupMenu();
-    subMenuOpenNew->CreatePopupMenu();
 
     int idCounter = 0;
     for (const IWApproachDefinition& approach : availableApproaches)
@@ -378,17 +374,11 @@ void IWWindow::CreatePopupMenu(CPoint point)
             MENU_ITEM_PROCEDURES_SEL_START + idCounter,
             CString(approach.title.c_str())
         );
-        subMenuOpenNew->AppendMenu(
-            MF_STRING, 
-            MENU_ITEM_PROCEDURES_NEW_START + idCounter, 
-            CString(approach.title.c_str())
-        );
 
         idCounter++;
     }
 
     popupMenu->AppendMenu(MF_POPUP, (UINT_PTR)subMenuSelect->Detach(), _T("ILS"));
-    //popupMenu->AppendMenu(MF_POPUP, (UINT_PTR)subMenuOpenNew->Detach(), _T("New window"));
 
     // Add static menu items
     popupMenu->AppendMenu(
@@ -457,16 +447,6 @@ void IWWindow::OnProcedureSelected(UINT nID)
         IWApproachDefinition selectedApproach = availableApproaches[index];
         SetActiveApproach(selectedApproach);
     }
-    else
-    {
-        // Open a new window with the selected approach
-        index = nID - MENU_ITEM_PROCEDURES_NEW_START;
-        if (index >= 0 && index < availableApproaches.size())
-        {
-            IWApproachDefinition selectedApproach = availableApproaches[index];
-            m_listener->OnWindowMenuOpenNew(selectedApproach.title);
-        }
-    }
     Invalidate();
 }
 

ILS_Window_Plugin/IWWindow.h

@@ -18,7 +18,6 @@ class IWWindow;
 class IIWWndEventListener {
 public:
     virtual void OnWindowClosed(IWWindow* window) = 0;
-    virtual void OnWindowMenuOpenNew(std::string title) = 0;
     virtual void OnWindowRectangleChanged(IWWindow* window) = 0;
     virtual void OnToggleThemeClicked(IWWindow* window) = 0;
 };

ILS_Window_Plugin/IWWindowManager.cpp

@@ -30,22 +30,6 @@ void IWWindowManager::OnWindowClosed(IWWindow* window)
     }
 }
 
-void IWWindowManager::OnWindowMenuOpenNew(std::string approachTitle)
-{
-    auto availableApproaches = this->settings->GetAvailableApproaches();
-    auto selectedApproach = std::find_if(availableApproaches.begin(), availableApproaches.end(),
-        [&approachTitle](const IWApproachDefinition& approach) {
-            return approach.title == approachTitle;
-        });
-
-    if (selectedApproach != availableApproaches.end()) {
-        OpenApproachView(*selectedApproach);
-    }
-    else {
-        OpenApproachView(availableApproaches[0]); 
-    }
-}
-
 void IWWindowManager::OnWindowRectangleChanged(IWWindow* window)
 {
     CRect windowRect;

ILS_Window_Plugin/IWWindowManager.h

@@ -25,7 +25,6 @@ class IWWindowManager : IIWWndEventListener
 
     // Callbacks from a window
     void OnWindowClosed(IWWindow* window) override;
-    void OnWindowMenuOpenNew(std::string approachTitle) override;
     void OnWindowRectangleChanged(IWWindow* window) override;
     void OnToggleThemeClicked(IWWindow* window) override;