X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fforms%2Fmain%2FfrmMain.h;h=5dd5ec3aad41b92d4d41187a58e87bfe0d3aff04;hb=e79afea4cd8930a1ebbdda0e3543dd0a89e45b34;hp=bce60c6cd069e34332f64c1cb4f718ae2bc98d3d;hpb=f0e33272a74b18dfb7262cddb8e0a76ac5a9be8b;p=xestiacalendar%2F.git

diff --git a/source/forms/main/frmMain.h b/source/forms/main/frmMain.h
index bce60c6..5dd5ec3 100644
--- a/source/forms/main/frmMain.h
+++ b/source/forms/main/frmMain.h
@@ -6,10 +6,22 @@
 Subclass of frmMainADT, which is generated by wxFormBuilder.
 */
 
+#include <map>
+#include <sys/types.h>
+#include <dirent.h>
+#include <wx/dir.h>
+
 #include "../../AppXestiaCalendar.h"
+
+#include "../about/frmAbout.h"
+#include "../update/frmUpdate.h"
+
 #include "../../widgets/XCCalendarCtrl.h"
+#include "../../libraries/CalendarDataStorage/CalendarDataStorage.h"
+#include "../../objects/calendarlist/CalendarList.h"
 #include "events.h"
-
+#include "preferences.h"
+#include "dirs.h"
 
 //// end generated include
 
@@ -18,10 +30,19 @@ class frmMain : public frmMainADT
 {
 	
 	private:
-		XCCalendarCtrl *MainCalendarCtrl = nullptr;
-		XCCalendarMonthView *MonthViewCtrl = nullptr;
+		XCCalendarCtrl *mainCalendarCtrl = nullptr;
+		XCCalendarMonthView *monthViewCtrl = nullptr;
+		XCALPreferences *preferences = nullptr;
+		CalendarDataStorage calendarData;
 	
 	protected:
+		void QuitApp( wxCloseEvent& event );
+		void QuitApp( wxCommandEvent& event );
+		void QuitApp();
+		void ShowUpdateWindow( wxCommandEvent& event );
+		void ShowAboutWindow( wxCommandEvent& event );
+		void LoadAccountData();
+
 	
 	public:
 		/** Constructor */