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

wxQt: Fix compiler error for ambiguous call

Browse Source 
(when compiling without unicode support)

Thanks @seandepagnier

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78383 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mariano Reingart
2015-01-19 02:44:11 +00:00
parent bb2db9d890
commit 3be53c43d7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/qt/dataobj.cpp
View File

@@ -57,7 +57,7 @@ wxDataFormat::wxDataFormat(const wxString &id)
wxDataFormat::wxDataFormat(const wxChar *id) wxDataFormat::wxDataFormat(const wxChar *id)
{ {
m_MimeType = wxQtConvertString(id); m_MimeType = wxQtConvertString((wxString)id);
} }
wxDataFormat::wxDataFormat(const QString &id) wxDataFormat::wxDataFormat(const QString &id)
@@ -67,7 +67,7 @@ wxDataFormat::wxDataFormat(const QString &id)
void wxDataFormat::SetId( const wxChar *id ) void wxDataFormat::SetId( const wxChar *id )
{ {
m_MimeType = wxQtConvertString(id); m_MimeType = wxQtConvertString((wxString)id);
} }
void wxDataFormat::SetId( const wxString& id ) void wxDataFormat::SetId( const wxString& id )