Compilation fixes for !wxUSE_STL & old wx versions

vslavik · Oct 7, 2018 · 316cf9c · 316cf9c
1 parent 7cd752a
commit 316cf9c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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__)