Skip to content

Commit 316cf9c

Browse files
committed
Compilation fixes for !wxUSE_STL & old wx versions
1 parent 7cd752a commit 316cf9c

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/catalog_xliff.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ class XLIFF12CatalogItem : public XLIFFCatalogItem
229229
}
230230
else
231231
{
232-
m_translations.emplace_back("");
232+
m_translations.push_back("");
233233
}
234234

235235
for (auto note: node.children("note"))
@@ -332,7 +332,7 @@ class XLIFF2CatalogItem : public XLIFFCatalogItem
332332
}
333333
else
334334
{
335-
m_translations.emplace_back("");
335+
m_translations.push_back("");
336336
}
337337

338338
std::string state = node.attribute("subState").value();

src/colorscheme.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ wxColour ColorScheme::DoGet(Color color, Mode mode)
113113
#elif defined(SUPPORTS_BGALPHA)
114114
return sRGB(255, 255, 255, 0.35);
115115
#else
116-
return DoGet(Color::ItemContextBg, type);
116+
return DoGet(Color::ItemContextBg, mode);
117117
#endif
118118

119119
// Tags:

src/str_helpers.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ inline wxString to_wx(const char *utf8)
9090

9191
inline wxString to_wx(const std::string& utf8)
9292
{
93-
return wxString::FromUTF8(utf8);
93+
return wxString::FromUTF8(utf8.c_str());
9494
}
9595

9696
#if defined(__cplusplus) && defined(__OBJC__)

0 commit comments

Comments
 (0)