Minor cleanup of code

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

diff --git a/source/widgets/XABContactMenu.h b/source/widgets/XABContactMenu.h
index c90c8d3..e9858b1 100644 (file)
--- a/source/widgets/XABContactMenu.h
+++ b/source/widgets/XABContactMenu.h
@@ -25,7 +25,17 @@
 #include <wx/listctrl.h>
 #include <wx/app.h>
 
-enum {
+enum XABContactMenuID {
+       ID_CONTACTMENU_OPEN = 1,
+       ID_CONTACTMENU_NEW,
+       ID_CONTACTMENU_EDIT,
+       ID_CONTACTMENU_DELETE,
+       ID_CONTACTMENU_REFRESHAB,
+       ID_CONTACTMENU_REVEAL,
+       ID_CONTACTMENU_SEPARATOR
+};
+
+enum XABContactMenuType {
        XABCONTACTMENU_MAIN,
        XABCONTACTMENU_SEARCH
 };
@@ -51,18 +61,20 @@ class XABContactMenu : public XABContactMenuADT
                wxListCtrl *ContactListCtrl = NULL;
                wxWindow *WindowPtr = NULL;
                bool EnableAccountSettings = FALSE;
+               bool SearchModeOnly = FALSE;
                void AppendMenuItem(wxString ObjectName,
                        wxString MenuName, 
                        wxString MenuDescription,
-                       int ItemID,
+                       XABContactMenuID ItemID,
                        wxItemKind ItemType);
        protected:
                void ProcessMenuItemClick(wxCommandEvent& event);
        public:
-               XABContactMenu(int MenuType);
+               XABContactMenu(XABContactMenuType MenuType);
                ~XABContactMenu();
-               void SetupPointers(wxWindow* WindowPtrIn,
-                       wxListCtrl* ContactListCtrlIn);
+               void SetupPointersSearch(wxWindow* WindowPtrIn,
+                       wxListCtrl* ContactListCtrlIn,
+                       bool SearchModeOnlyIn);
                void SetupPointers(wxWindow* WindowPtrIn,
                        wxListCtrl* ContactListCtrlIn, 
                        bool EnableAccountSettingsIn);