Removed UpdatedWindowList from frmMain

[xestiaab/.git] / source / frmMain.cpp

diff --git a/source/frmMain.cpp b/source/frmMain.cpp
index 83eaa16..6c57e6b 100644 (file)
--- a/source/frmMain.cpp
+++ b/source/frmMain.cpp
@@ -1,3 +1,21 @@
+// frmMain.cpp - Main window form.
+//
+// (c) 2012-2015 Xestia Software Development.
+//
+// This file is part of Xestia Address Book.
+//
+// Xestia Address Book is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by the
+// Free Software Foundation, version 3 of the license.
+//
+// Xestia Address Book is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with Xestia Address Book. If not, see <http://www.gnu.org/licenses/>
+
 #include <iostream>
 #include <algorithm>
 #include <vector>
@@ -14,7 +32,6 @@
 #include <wx/stdpaths.h>
 #include <wx/fileconf.h>
 #include <wx/gdicmn.h>
-//#include <boost/filesystem/fstream.hpp>
 
 // Include the forms.
 
@@ -22,11 +39,11 @@
 #include "frmAbout.h"
 #include "frmPreferences.h"
 #include "frmNewAccount.h"
-#include "frmActivityMgr.h"
+#include "actmgr/frmActivityMgr.h"
 #include "frmContact.h"
 #include "frmConflictResolution.h"
 #include "frmInvalidSSLCertificate.h"
-#include "frmSearch.h"
+#include "search/frmSearch.h"
 #include "frmSSLCertificate.h"
 #include "frmUpdate.h"
 #include "import/frmImportResults.h"
@@ -1844,20 +1861,6 @@ void frmMain::RemoveContactEditorWindowPointer(wxCommandEvent& event){
     
 }
 
-void frmMain::UpdateWindowList(wxCommandEvent& event){
-    
-    // Update the Window List.
-    
-    // Delete the existing items in the window menu.
-    
-    // Get the list of contacts.
-    
-    // Insert a separator.
-    
-    // Get the list of search windows.
-    
-}
-
 void frmMain::RevealContact(wxCommandEvent& event){
     
     UCNotif *uc = (UCNotif*)event.GetClientData();
@@ -2370,15 +2373,7 @@ void frmMain::WindowEdit( wxCommandEvent &event ){
         std::map<int, wxMenuItem*>::iterator MenuIter = WindowListPointersMenu.find(WData->WindowID);
         
         MenuIter->second->SetItemLabel(WindowTitle);
-        
-        //mnuWindow->FindChildItem(intID, &pos);
-        //wxMenuItem *mnuNewItem = new wxMenuItem(NULL, WData->WindowID, WindowTitle, WData->WindowID), wxEmptyString, wxITEM_NORMAL, NULL);
-        //mnuNewItem->SetId(WData->WindowID);
-        //ContactWindowListPointersMenu.insert(std::make_pair(WData->WindowID, mnuNewItem));
-        //ContactWindowListPointers.insert(std::make_pair(WData->WindowID, WData->WindowPointer));
-        //mnuWindow->Insert((pos + 1), mnuNewItem);
-        //this->Connect(mnuNewItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(frmMain::ShowContactWindow));
-        
+                
     } else if (WData->DataType == 1){
         
         // Get the window title and use that.
@@ -2399,14 +2394,6 @@ void frmMain::WindowEdit( wxCommandEvent &event ){
             
         }
         
-        //mnuWindow->FindChildItem(intID, &pos);
-        //wxMenuItem *mnuNewItem = new wxMenuItem(NULL, WData->WindowID, WindowTitle, WData->WindowID), wxEmptyString, wxITEM_NORMAL, NULL);
-        //mnuNewItem->SetId(WData->WindowID);
-        //ContactEditorWindowListPointersMenu.insert(std::make_pair(WData->WindowID, mnuNewItem));
-        //ContactEditorWindowListPointers.insert(std::make_pair(WData->WindowID, WData->WindowPointer));
-        //mnuWindow->Insert((pos + 1), mnuNewItem);
-        //this->Connect(mnuNewItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(frmMain::ShowContactEditorWindow));
-        
     }
     
     delete WData;