X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fmain.cpp;h=77f7fbf32de5d547223539e6be0baf0679547c2e;hb=54c0cc46a20bfd13a8f0c3130520bcc06359bc9c;hp=b4be0fdf71ae3919758e7beddbaead3a00cd54f0;hpb=720aa0c2762f8f7f4175435e68e69eefd0a3b0a5;p=xestiacalendar%2F.git diff --git a/source/main.cpp b/source/main.cpp index b4be0fd..77f7fbf 100644 --- 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. @@ -83,19 +83,19 @@ bool XestiaCALApp::OnInit() SetupDefaultSettings(); SetupDefaultCalendar(); - frmMain *frame = new frmMain( NULL ); + 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;