{
//==================================================================
/// Conversion std::string to wxString
- inline wxString std2wx(const std::string& s) {
+ inline wxString std2wx(const std::string& s)
+ {
+
+/*
wxString wx;
const char* my_string=s.c_str();
wxMBConvUTF8 *wxconv= new wxMBConvUTF8();
delete wxconv;
// test if conversion works of not. In case it fails convert from Ascii
if(wx.length()==0)
- wx=wxString(wxString::FromAscii(s.c_str()));
+ {
+ wx = wxString(wxString::FromAscii(s.c_str()));
+ }
+ */
+ // EED 2022-10-27
+ wxString wx( s.c_str() , wxConvUTF8);
return wx;
}
//==================================================================
/// Conversion wxString to std::string
inline std::string wx2std(const wxString& s){
std::string s2;
- if(s.wxString::IsAscii()) {
+ if(s.wxString::IsAscii())
+ {
s2=s.wxString::ToAscii();
} else {
const wxWX2MBbuf tmp_buf = wxConvCurrent->cWX2MB(s);