frmPreferences: Make the General tab be the first tab that is shown

[xestiacalendar/.git] / source / main.cpp

diff --git a/source/main.cpp b/source/main.cpp
index 2faffa9..77f7fbf 100644 (file)
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -1,14 +1,14 @@
 // main.cpp - Main subroutine (application start).
 //
-// (c) 2012-2015 Xestia Software Development.
+// (c) 2012-2017 Xestia Software Development.
 //
 // This file is part of Xestia Calendar.
 //
-// Xestia Address Book is free software: you can redistribute it and/or modify
+// Xestia Calendar is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by the
 // Free Software Foundation, version 3 of the license.
 //
-// Xestia Address Book is distributed in the hope that it will be useful,
+// Xestia Calendar is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
@@ -29,6 +29,7 @@
 #include "version.h"
 #include "bitmaps.h"
 #include "forms/main/frmMain.h"
+#include "defaults.h"
 
 class XestiaCALApp: public wxApp
 {
@@ -76,19 +77,25 @@ bool XestiaCALApp::OnInit()
     
        }
        
-       frmMain *frame = new frmMain( NULL );
+       // Setup the default accounts.
+       
+       SetupDirectories();
+       SetupDefaultSettings();
+       SetupDefaultCalendar();
+       
+       frmMain *frameMain = new frmMain( NULL );
        
        wxMemoryInputStream istream(bigimgs_appicon48_png, sizeof(bigimgs_appicon48_png));
        wxImage bigimgs_appicon48i(istream, wxBITMAP_TYPE_PNG);
-       wxBitmap appiconbmp(bigimgs_appicon48i, -1);    
-       wxIcon appicon;
+       wxBitmap appIconBMP(bigimgs_appicon48i, -1);    
+       wxIcon appIcon;
     
-       appicon.CopyFromBitmap(appiconbmp);
+       appIcon.CopyFromBitmap(appIconBMP);
        
-       frame->SetIcon(appicon);
-       frame->Show(true);
+       frameMain->SetIcon(appIcon);
+       frameMain->Show(true);
        
-       SetTopWindow(frame);
+       SetTopWindow(frameMain);
        
        return true;