update wxWidgets, added ninja in doc

README.md

@@ -16,17 +16,19 @@ shows a usage of this library, offering a full featured source code text editor.
 ```bash
 git clone --recursive https://github.com/antonvw/wex.git
 mkdir build && cd build
-cmake .. && make && make install
 ```
 
-For Visual Studio do
+and for Linux, osx do
+  `cmake -G Ninja .. && ninja && ninja install` or
+  `cmake .. && make && make install`,
+for Visual Studio do
   `devenv wex.sln /build Release`,
-for mingw add `-G "MinGW Makefiles"` and do `mingw32-make`.
+and for mingw add `-G "MinGW Makefiles"` and do `mingw32-make`.
 
 If you would like to use shared libs for Boost, wxWidgets and wex add
 `-DwexBUILD_SHARED=ON`.
 
-To use wex lib in your own application do `make install`
+To use wex lib in your own application do `ninja install` or `make install`
 (on windows as administrator `cmake.exe -P cmake_install.cmake`)
 and do `find_package(WEX)` in your CMakeLists.txt. This will provide the
 `wex_FOUND`, `wex_INCLUDE_DIR`, `wex_LIB_DIR` and `wex_LIBRARIES` variables.

cmake/options-wx.cmake

@@ -17,7 +17,7 @@ option(wxUSE_PROPGRID "Use propgrid" OFF)
 option(wxUSE_REGEX "Use wx regex" builtin)
 option(wxUSE_RIBBON "Use ribbon" OFF)
 option(wxUSE_RICHTEXT "Use richtext" OFF)
-option(wxUSE_STL "Use STL" ON)
+option(wxUSE_STD_STRING_CONV_IN_WXSTRING "Use std::string" 1)
 option(wxUSE_UNICODE "Use Unicode" ON)
 option(wxUSE_WEBVIEW "Use webview" OFF)
 option(wxUSE_WEBVIEW_WEBKIT "Use webviewkit" OFF)

doc/README.md

@@ -425,8 +425,7 @@ It benefits from the following boost libraries:
 
 lib  | info
 -----|------
-boost::algorithm lib | uses find_tail, icontains, iequals, replace_all,
-  to_upper, trim
+boost::algorithm lib | uses find_tail, icontains, iequals, replace_all, to_upper, trim
 boost::json lib | to implement wex::config
 boost::log lib | to implement wex::log
 boost::process lib | to implement wex::process

include/wex/core/log.h

@@ -155,11 +155,10 @@ class log
   void              flush();
   const std::string S(); // separator
 
-  const std::string  m_topic;
-  std::stringstream  m_ss;
-  std::wstringstream m_wss;
-  bool               m_separator{true};
-  level_t            m_level;
+  const std::string m_topic;
+  std::stringstream m_ss;
+  bool              m_separator{true};
+  level_t           m_level;
 
   static inline bool    m_initialized{false};
   static inline level_t m_level_filter;

src/core/log.cpp

@@ -17,10 +17,19 @@
 #include <wx/app.h>
 #include <wx/log.h>
 
+#include <codecvt>
 #include <iomanip>
 
 namespace logging = boost::log;
 
+std::string ws2s(const std::wstring& wstr)
+{
+  using convert_typeX = std::codecvt_utf8<wchar_t>;
+  std::wstring_convert<convert_typeX, wchar_t> converterX;
+
+  return converterX.to_bytes(wstr);
+}
+
 wex::log::log(const std::string& topic)
   : log(topic, LEVEL_ERROR)
 {
@@ -115,7 +124,7 @@ wex::log& wex::log::operator<<(const char* r)
 
 wex::log& wex::log::operator<<(const wchar_t* r)
 {
-  m_wss << S() << r;
+  m_ss << S() << ws2s(r);
   return *this;
 }
 
@@ -218,10 +227,8 @@ void wex::log::flush()
 
 const std::string wex::log::get() const
 {
-  return (!m_topic.empty() && (!m_ss.str().empty() || !m_wss.str().empty()) ?
-            m_topic + ":" :
-            m_topic) +
-         m_ss.str() + m_wss.str();
+  return (!m_topic.empty() && !m_ss.str().empty() ? m_topic + ":" : m_topic) +
+         m_ss.str();
 }
 
 std::string wex::log::get_level_info()