Compilation fixes for !wxUSE_STL

vslavik · vslavik · commit 7395c1a482d1 · 2018-10-07T11:17:46.000+02:00
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/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__)

Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,7 @@ class XLIFF12CatalogItem : public XLIFFCatalogItem`
`229`	`229`	`}`
`230`	`230`	`else`
`231`	`231`	`{`
`232`		`- m_translations.emplace_back("");`
	`232`	`+ m_translations.push_back("");`
`233`	`233`	`}`
`234`	`234`
`235`	`235`	`for (auto note: node.children("note"))`
`@@ -332,7 +332,7 @@ class XLIFF2CatalogItem : public XLIFFCatalogItem`
`332`	`332`	`}`
`333`	`333`	`else`
`334`	`334`	`{`
`335`		`- m_translations.emplace_back("");`
	`335`	`+ m_translations.push_back("");`
`336`	`336`	`}`
`337`	`337`
`338`	`338`	`std::string state = node.attribute("subState").value();`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ inline wxString to_wx(const char *utf8)`
`90`	`90`
`91`	`91`	`inline wxString to_wx(const std::string& utf8)`
`92`	`92`	`{`
`93`		`- return wxString::FromUTF8(utf8);`
	`93`	`+ return wxString::FromUTF8(utf8.c_str());`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`#if defined(__cplusplus) && defined(__OBJC__)`