X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fwidgets%2FXABContactMenu.cpp;h=6a30afcb95ad7cb8b4cd1479f822f871579366b6;hb=176323555ae58da5fec1ac843e0c613a0b9dabba;hp=cfef818d0c8e35960cb733c85fd5bf8278cbcc15;hpb=dfa9f8aa5104828d7464a02c0bcf2a6021993eff;p=xestiaab%2F.git

diff --git a/source/widgets/XABContactMenu.cpp b/source/widgets/XABContactMenu.cpp
index cfef818..6a30afc 100644
--- a/source/widgets/XABContactMenu.cpp
+++ b/source/widgets/XABContactMenu.cpp
@@ -1,6 +1,6 @@
 // XABContactMenu.cpp - XABContactMenu widget
 //
-// (c) 2012-2015 Xestia Software Development.
+// (c) 2012-2016 Xestia Software Development.
 //
 // This file is part of Xestia Address Book.
 //
@@ -20,16 +20,7 @@
 #include "../frmMain.h"
 #include "../search/frmSearch.h"
 
-enum {
-	ID_CONTACTMENU_OPEN,
-	ID_CONTACTMENU_NEW,
-	ID_CONTACTMENU_EDIT,
-	ID_CONTACTMENU_DELETE,
-	ID_CONTACTMENU_REFRESHAB,
-	ID_CONTACTMENU_REVEAL
-};
-
-XABContactMenu::XABContactMenu(int MenuTypeIn){
+XABContactMenu::XABContactMenu(XABContactMenuType MenuTypeIn){
 
 	// Setup the XABContactMenu control.
 	
@@ -37,24 +28,24 @@ XABContactMenu::XABContactMenu(int MenuTypeIn){
 
 	// Setup the menu items.
 	
-	AppendMenuItem(wxT("opencontact"), _("Open Contact..."), _(""), ID_CONTACTMENU_OPEN, wxITEM_NORMAL);
-	AppendMenuItem(wxT("sep1"), _(""), _(""), wxID_ANY, wxITEM_SEPARATOR);
+	AppendMenuItem(wxT("opencontact"), _("Open Contact..."), wxT(""), ID_CONTACTMENU_OPEN, wxITEM_NORMAL);
+	AppendMenuItem(wxT("sep1"), wxT(""), wxT(""), ID_CONTACTMENU_SEPARATOR, wxITEM_SEPARATOR);
 	
 	if (MenuType == XABCONTACTMENU_MAIN){
 	
 		// Setup up the add contact option if in the main window.
 
-		AppendMenuItem(wxT("newcontact"), _("New Contact..."), _(""), ID_CONTACTMENU_NEW, wxITEM_NORMAL);
+		AppendMenuItem(wxT("newcontact"), _("New Contact..."), wxT(""), ID_CONTACTMENU_NEW, wxITEM_NORMAL);
 	
 	}
 	
-	AppendMenuItem(wxT("editcontact"), _("Edit Contact..."), _(""), ID_CONTACTMENU_EDIT, wxITEM_NORMAL);
+	AppendMenuItem(wxT("editcontact"), _("Edit Contact..."), wxT(""), ID_CONTACTMENU_EDIT, wxITEM_NORMAL);
 
 	if (MenuType == XABCONTACTMENU_SEARCH){
 	
 		// Setup up the reveal contact option if in the search window.
 	
-		AppendMenuItem(wxT("revealcontact"), _("Reveal Contact..."), _(""), ID_CONTACTMENU_REVEAL, wxITEM_NORMAL);
+		AppendMenuItem(wxT("revealcontact"), _("Reveal Contact..."), wxT(""), ID_CONTACTMENU_REVEAL, wxITEM_NORMAL);
 	
 	}
 	
@@ -62,9 +53,9 @@ XABContactMenu::XABContactMenu(int MenuTypeIn){
 	
 		// Setup the delete and refresh contact options if in the main window.
 	
-		AppendMenuItem(wxT("deletecontact"), _("Delete Contact..."), _(""), ID_CONTACTMENU_DELETE, wxITEM_NORMAL);
-		AppendMenuItem(wxT("sep2"), _(""), _(""), wxID_ANY, wxITEM_SEPARATOR);
-		AppendMenuItem(wxT("refreshab"), _("Refresh Address Book"), _(""), ID_CONTACTMENU_REFRESHAB, wxITEM_NORMAL);
+		AppendMenuItem(wxT("deletecontact"), _("Delete Contact..."), wxT(""), ID_CONTACTMENU_DELETE, wxITEM_NORMAL);
+		AppendMenuItem(wxT("sep2"), wxT(""), wxT(""), ID_CONTACTMENU_SEPARATOR, wxITEM_SEPARATOR);
+		AppendMenuItem(wxT("refreshab"), _("Refresh Address Book"), wxT(""), ID_CONTACTMENU_REFRESHAB, wxITEM_NORMAL);
 	
 	}
 
@@ -95,22 +86,18 @@ XABContactMenu::~XABContactMenu(){
 void XABContactMenu::AppendMenuItem(wxString ObjectName, 
 	wxString MenuName, 
 	wxString MenuDescription,
-	int ItemID,
+	XABContactMenuID ItemID,
 	wxItemKind ItemType){
 	
-	// Append a menu item to the XABContactMenu control.
-		
-	wxMenuItem *menuitem = new wxMenuItem(
-		NULL,
-		ItemID,
-		MenuName,
-		MenuDescription,
-		ItemType,
-		NULL
-	);
+	if (ItemType == wxITEM_SEPARATOR){
+		this->AppendSeparator();
+		return;
+	}
 	
+	// Append a menu item to the XABContactMenu control.
+
+	wxMenuItem *menuitem = this->Append(ItemID, MenuName, MenuDescription);
 	this->Connect(menuitem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(XABContactMenu::ProcessMenuItemClick));
-	this->Append(menuitem);
 	MenuItems.insert(std::make_pair(ObjectName.ToStdString(), menuitem));
 
 }