Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert the changes of r65826 in wxConvertToGTK().

Browse Source 
This is not necessary any longer after the previous commit which changed
cMB2WC() to not return NULL for empty input.

See #12432.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65837 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-10-17 13:59:48 +00:00
parent cfcfada96e
commit e3cd024e85
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gtk/utilsgtk.cpp
View File

@@ -116,12 +116,6 @@ wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
WXDLLIMPEXP_CORE wxCharBuffer WXDLLIMPEXP_CORE wxCharBuffer
wxConvertToGTK(const wxString& s, wxFontEncoding enc) wxConvertToGTK(const wxString& s, wxFontEncoding enc)
{ {
// Passing an empty string to cMB2WC() returns an invalid buffer, i.e. a
// buffer whose data is NULL and this can result in passing NULL to a GTK+
// function and a crash, so handle this case specially to avoid this.
if ( s.empty() )
return wxCharBuffer("");
wxWCharBuffer wbuf; wxWCharBuffer wbuf;
if ( enc == wxFONTENCODING_SYSTEM || enc == wxFONTENCODING_DEFAULT ) if ( enc == wxFONTENCODING_SYSTEM || enc == wxFONTENCODING_DEFAULT )
{ {