X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3b81515cb19f17208db39eb959b646f185de61a4..11716cbe14313011016472f56edb51c55aabe852:/src/gtk/utilsgtk.cpp diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp index abe0d0424c..bfe8e9c076 100644 --- a/src/gtk/utilsgtk.cpp +++ b/src/gtk/utilsgtk.cpp @@ -45,8 +45,9 @@ #include #include #include -#include // for WNOHANG +#ifdef __UNIX__ #include +#endif #if wxUSE_DETECT_SM #include @@ -121,7 +122,7 @@ wxConvertToGTK(const wxString& s, wxFontEncoding enc) wxWCharBuffer wbuf; if ( enc == wxFONTENCODING_SYSTEM || enc == wxFONTENCODING_DEFAULT ) { - wbuf = wxConvUI->cMB2WC(s.c_str()); + wbuf = wxConvUI->cMB2WC(s); } else // another encoding, use generic conversion class { @@ -303,25 +304,11 @@ protected: virtual void OnStackFrame(const wxStackFrame& frame) { wxString fncname = frame.GetName(); - wxString fncargs = fncname; - - size_t n = fncname.find(wxT('(')); - if (n != wxString::npos) - { - // remove arguments from function name - fncname.erase(n); - - // remove function name and brackets from arguments - fncargs = fncargs.substr(n+1, fncargs.length()-n-2); - } - else - fncargs = wxEmptyString; // append this stack frame's info in the dialog if (!frame.GetFileName().empty() || !fncname.empty()) gtk_assert_dialog_append_stack_frame(m_dlg, fncname.mb_str(), - fncargs.mb_str(), frame.GetFileName().mb_str(), frame.GetLine()); }