Fixed right click menu which showed active menu items when it shouldn't in Search...

[xestiaab/.git] / source / widgets / XABContactMenu.cpp

diff --git a/source/widgets/XABContactMenu.cpp b/source/widgets/XABContactMenu.cpp
index fc3f59a..b468833 100644 (file)
--- a/source/widgets/XABContactMenu.cpp
+++ b/source/widgets/XABContactMenu.cpp
@@ -109,11 +109,13 @@ void XABContactMenu::AppendMenuItem(wxString ObjectName,
 
 }
 
-void XABContactMenu::SetupPointers(wxWindow* WindowPtrIn,
-       wxListCtrl* ContactListCtrlIn){
+void XABContactMenu::SetupPointersSearch(wxWindow* WindowPtrIn,
+       wxListCtrl* ContactListCtrlIn,
+       bool SearchModeOnlyIn){
 
        WindowPtr = WindowPtrIn;
        ContactListCtrl = ContactListCtrlIn;
+       SearchModeOnly = SearchModeOnlyIn;
 
 }
 
@@ -177,10 +179,22 @@ wxMenu* XABContactMenu::MenuPointer(){
        
                std::map<std::string, wxMenuItem*>::iterator MenuItemIter = MenuItems.find("opencontact");
                MenuItemIter->second->Enable(ContactSelected);
-               MenuItemIter = MenuItems.find("editcontact");
-               MenuItemIter->second->Enable(ContactSelected);
-               MenuItemIter = MenuItems.find("revealcontact");
-               MenuItemIter->second->Enable(ContactSelected);
+               
+               if (SearchModeOnly == TRUE){
+
+                       MenuItemIter = MenuItems.find("editcontact");
+                       MenuItemIter->second->Enable(FALSE);
+                       MenuItemIter = MenuItems.find("revealcontact");
+                       MenuItemIter->second->Enable(FALSE);
+               
+               } else {
+               
+                       MenuItemIter = MenuItems.find("editcontact");
+                       MenuItemIter->second->Enable(ContactSelected);
+                       MenuItemIter = MenuItems.find("revealcontact");
+                       MenuItemIter->second->Enable(ContactSelected);
+       
+               }
        
        }