fix boost log timestamps; comment out windows focus hack

CMakeLists.txt

@@ -181,13 +181,12 @@ target_compile_definitions(${APP_NAME} PRIVATE
     BOOST_ATOMIC_DYN_LINK
     BOOST_CHRONO_DYN_LINK
     BOOST_FILESYSTEM_DYN_LINK
-    BOOST_LIB_DIAGNOSTIC
     BOOST_LOG_DYN_LINK
     BOOST_REGEX_DYN_LINK
     BOOST_THREAD_DYN_LINK
     BOOST_ALL_NO_LIB
     BOOST_LIB_DIAGNOSTIC
-    BOOST_USE_WINAPI_VERSION=0x0602)
+    BOOST_USE_WINAPI_VERSION=0x0600)
 target_link_libraries(${APP_NAME} PRIVATE ${Boost_LIBRARIES})
 
 find_package(wxWidgets REQUIRED COMPONENTS base core xrc qa)

bin/Linux/setup.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 echo "::group::configure kinetic"
-sudo add-apt-repository "deb http://mirror.math.princeton.edu/pub/ubuntu kinetic main universe"
+sudo add-apt-repository "deb http://mirror.math.princeton.edu/pub/ubuntu lunar main universe"
 echo "::endgroup::"
 
 echo "::group::install dependencies"

src/E2wxApp.cpp

@@ -36,15 +36,17 @@
 #include <wx/stdpaths.h>
 #include <wx/debugrpt.h>
 
+#include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/log/core.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/log/utility/setup/file.hpp>
 #include <boost/log/utility/setup/common_attributes.hpp>
 #include <boost/log/sources/severity_feature.hpp>
 #include <boost/log/sources/record_ostream.hpp>
+#include <boost/log/expressions/formatters/date_time.hpp>
 #include <boost/log/expressions/formatters/stream.hpp>
 #include <boost/log/expressions.hpp>
-#include <boost/date_time/posix_time/posix_time.hpp>
+#include <boost/log/support/date_time.hpp>
 
 #include <iostream>
 #include <string>
@@ -357,14 +359,15 @@ void E2wxApp::InitBoostLog() {
 
 
     boost::log::add_file_log(
-            boost::log::keywords::file_name = this->logfile,
-            boost::log::keywords::auto_flush = true,
-            boost::log::keywords::format = (
-                boost::log::expressions::stream <<
-                    to_iso_extended_string(boost::posix_time::microsec_clock::universal_time()) << "Z " <<
-                    boost::log::trivial::severity << " " <<
-                    boost::log::expressions::message
-            ));
+        boost::log::keywords::file_name = this->logfile,
+        boost::log::keywords::auto_flush = true,
+        boost::log::keywords::format = (
+            boost::log::expressions::stream <<
+                boost::log::expressions::format_date_time<boost::posix_time::ptime>("TimeStamp", "%Y-%m-%dT%H:%M:%S.%fZ") << " " <<
+                boost::log::trivial::severity << " " <<
+                boost::log::expressions::message
+        )
+    );
 
     boost::log::add_common_attributes();
 }

src/E2wxApp.h

@@ -23,8 +23,6 @@
 
 
 
-#include <SDL_keycode.h>
-
 #include <wx/defs.h>
 #include <wx/app.h>
 #include <wx/event.h>

src/main.cpp

@@ -18,6 +18,7 @@
 */
 
 #include "gui.h"
+#include <SDL.h>
 #include <wx/app.h>
 #include <cstdio>
 

src/screenimage.cpp

@@ -92,9 +92,9 @@ ScreenImage::~ScreenImage() {
 
 
 void ScreenImage::OnIdle(wxIdleEvent &evt) {
-    if (!this->FindFocus() || !this->sdl->HasFocus()) {
-        this->sdl->SetFocus();
-    }
+//    if (!this->FindFocus() || !this->sdl->HasFocus()) {
+//        this->sdl->SetFocus();
+//    }
 }
 
 void ScreenImage::HandleUserCloseWindowRequest(wxCloseEvent& event) {