github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-21 06:45:39 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

.cosmetics

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@7916 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2014-11-22 10:07:33 +00:00
parent 7d1cc9de8c
commit ff14e98830
2 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
autotest/Time/Time.cpp
View file

@ -11,11 +11,7 @@ CONSOLE_APP_MAIN
DUMP(GetTimeZone());
Date d = GetSysDate();
if(d < Date(d.year, 3, 20) && d > Date(d.year - 1, 10, 30)) {
<<<<<<< .mine
LOG("Normalni CZ time");
=======
LOG("Normal CZ time");
>>>>>>> .r7914
ASSERT(GetTimeZone() == 60);
ASSERT(ScanWwwTime("Tue, 25 Mar 2014 12:01:15 +1200") == Time(2014, 3, 25, 23, 1, 15));
ASSERT(ScanWwwTime("Tue, 25 Mar 2014 12:01:15 +1000") == Time(2014, 3, 25, 21, 1, 15));

6
tutorial/Gui12/main.cpp
View file

@ -46,9 +46,9 @@ struct MyAppWindow : TopWindow {
AddFrame(status);
AddFrame(InsetFrame());
menu.Set(THISBACK(MainMenu));
menu.WhenHelp = status;
tool.Set(THISBACK(SubBar));
tool.WhenHelp = status;
menu.WhenHelp = status; // callback cast to fix it for older CLANG version in C++11
tool.Set(THISBACK(SubBar));
tool.WhenHelp = status; // callback cast to fix it for older CLANG version in C++11
}
};