widgets: Cleanup objects in destructors and minor code cleanup

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

diff --git a/source/widgets/XCEventMenu.h b/source/widgets/XCEventMenu.h
index b4411af..dab6023 100644 (file)
--- a/source/widgets/XCEventMenu.h
+++ b/source/widgets/XCEventMenu.h
@@ -1,4 +1,4 @@
-// XCEventMenu.cpp - XCEventMenu widget header
+// XCEventMenu.h - XCEventMenu widget header
 //
 // (c) 2012-2017 Xestia Software Development.
 //
@@ -36,26 +36,24 @@ class XCEventMenuADT : public wxMenu
                
        protected:
                virtual void ProcessMenuItemClick(wxCommandEvent& event) {event.Skip();};
-       public:
-               XCEventMenuADT(){};
-               ~XCEventMenuADT(){};
 
 };
 
 class XCEventMenu : public XCEventMenuADT
 {
        private:
-               std::map<std::string, wxMenuItem*> MenuItems = {};
-               wxWindow *WindowPtr = NULL;
-               bool EnableAccountSettings = FALSE;
-               bool SearchModeOnly = FALSE;
+               std::map<std::string, wxMenuItem*> menuItems = {};
+               wxWindow *windowPtr = NULL;
+               bool enableAccountSettings = FALSE;
+               bool searchModeOnly = FALSE;
+               int calendarID = 0;
+               int eventID = 0;
                void AppendMenuItem(wxString ObjectName,
                        wxString MenuName, 
                        wxString MenuDescription,
                        XCEventMenuID ItemID,
                        wxItemKind ItemType);
-               int calendarID = 0;
-               int eventID = 0;
+
        protected:
                void ProcessMenuItemClick(wxCommandEvent& event);
        public: