From 3be53c43d7c816f59dbb8daa790658db34db08c7 Mon Sep 17 00:00:00 2001 From: Mariano Reingart Date: Mon, 19 Jan 2015 02:44:11 +0000 Subject: [PATCH] wxQt: Fix compiler error for ambiguous call (when compiling without unicode support) Thanks @seandepagnier git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78383 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/qt/dataobj.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qt/dataobj.cpp b/src/qt/dataobj.cpp index b406310f30..7ecb014877 100644 --- a/src/qt/dataobj.cpp +++ b/src/qt/dataobj.cpp @@ -57,7 +57,7 @@ wxDataFormat::wxDataFormat(const wxString &id) wxDataFormat::wxDataFormat(const wxChar *id) { - m_MimeType = wxQtConvertString(id); + m_MimeType = wxQtConvertString((wxString)id); } wxDataFormat::wxDataFormat(const QString &id) @@ -67,7 +67,7 @@ wxDataFormat::wxDataFormat(const QString &id) void wxDataFormat::SetId( const wxChar *id ) { - m_MimeType = wxQtConvertString(id); + m_MimeType = wxQtConvertString((wxString)id); } void wxDataFormat::SetId( const wxString& id )