Fix ANSI build for GTK+ 2

Operands of the ?: had different types, so add an explicit conversion to
wxString.

Closes https://github.com/wxWidgets/wxWidgets/pull/983
This commit is contained in:
Lauri Nurmi
2018-10-17 22:23:04 +03:00
committed by Vadim Zeitlin
parent b5face97bc
commit b9e813f9d3

View File

@@ -239,7 +239,7 @@ GtkWidget *wxInfoBar::GTKAddButton(wxWindowID btnid, const wxString& label)
#if defined(__WXGTK3__) && GTK_CHECK_VERSION(3,10,0)
wxGTK_CONV(wxConvertMnemonicsToGTK(wxGetStockLabel(btnid)))
#else
wxGetStockGtkID(btnid)
wxString(wxGetStockGtkID(btnid))
#endif // GTK >= 3.10 / < 3.10
: wxGTK_CONV(label),
btnid