widgets: Cleanup objects in destructors and minor code cleanup

[xestiacalendar/.git] / source / widgets / XCCalendarMenu.h

diff --git a/source/widgets/XCCalendarMenu.h b/source/widgets/XCCalendarMenu.h
index 9a5bb2c..403735f 100644 (file)
--- a/source/widgets/XCCalendarMenu.h
+++ b/source/widgets/XCCalendarMenu.h
@@ -45,19 +45,20 @@ class XCCalendarMenuADT : public wxMenu
 class XCCalendarMenu : public XCCalendarMenuADT
 {
        private:
-               std::map<std::string, wxMenuItem*> MenuItems = {};
-               wxListCtrl *ContactListCtrl = NULL;
-               wxWindow *WindowPtr = NULL;
-               wxPopupTransientWindow *PopupPtr = NULL;
-               bool EnableAccountSettings = FALSE;
-               bool SearchModeOnly = FALSE;
-               void AppendMenuItem(wxString ObjectName,
-                       wxString MenuName, 
-                       wxString MenuDescription,
-                       XCCalendarMenuID ItemID,
-                       wxItemKind ItemType);
+               std::map<std::string, wxMenuItem*> menuItems = {};
+               wxWindow *windowPtr = NULL;
+               wxPopupTransientWindow *popupPtr = NULL;
+               bool enableAccountSettings = FALSE;
+               bool searchModeOnly = FALSE;
                int calendarID = 0;
                int accountPreferencesID = 0;
+
+               void AppendMenuItem(wxString objectName,
+                       wxString menuName, 
+                       wxString menuDescription,
+                       XCCalendarMenuID itemID,
+                       wxItemKind itemType);
+
        protected:
                void ProcessMenuItemClick(wxCommandEvent& event);
        public: