From 316cf9cc2d915d097b440600afb8c37fe24d0055 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Va=CC=81clav=20Slavi=CC=81k?= <vaclav@slavik.io>
Date: Sun, 7 Oct 2018 10:17:35 +0200
Subject: [PATCH] Compilation fixes for !wxUSE_STL & old wx versions

---
 src/catalog_xliff.cpp | 4 ++--
 src/colorscheme.cpp   | 2 +-
 src/str_helpers.h     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/catalog_xliff.cpp b/src/catalog_xliff.cpp
index 44f5772293..955af858a1 100644
--- a/src/catalog_xliff.cpp
+++ b/src/catalog_xliff.cpp
@@ -229,7 +229,7 @@ class XLIFF12CatalogItem : public XLIFFCatalogItem
         }
         else
         {
-            m_translations.emplace_back("");
+            m_translations.push_back("");
         }
 
         for (auto note: node.children("note"))
@@ -332,7 +332,7 @@ class XLIFF2CatalogItem : public XLIFFCatalogItem
         }
         else
         {
-            m_translations.emplace_back("");
+            m_translations.push_back("");
         }
 
         std::string state = node.attribute("subState").value();
diff --git a/src/colorscheme.cpp b/src/colorscheme.cpp
index 2c87ebc132..25e9cfa54a 100644
--- a/src/colorscheme.cpp
+++ b/src/colorscheme.cpp
@@ -113,7 +113,7 @@ wxColour ColorScheme::DoGet(Color color, Mode mode)
             #elif defined(SUPPORTS_BGALPHA)
             return sRGB(255, 255, 255, 0.35);
             #else
-            return DoGet(Color::ItemContextBg, type);
+            return DoGet(Color::ItemContextBg, mode);
             #endif
 
         // Tags:
diff --git a/src/str_helpers.h b/src/str_helpers.h
index abd6ad5a5f..c89121d574 100644
--- a/src/str_helpers.h
+++ b/src/str_helpers.h
@@ -90,7 +90,7 @@ inline wxString to_wx(const char *utf8)
 
 inline wxString to_wx(const std::string& utf8)
 {
-    return wxString::FromUTF8(utf8);
+    return wxString::FromUTF8(utf8.c_str());
 }
 
 #if defined(__cplusplus) && defined(__OBJC__)