From 9680ce04e22dc9afbc1cf71957425d837e8ce31b Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Fri, 4 Jul 2014 16:52:02 +0000 Subject: [PATCH] resolving ambiguity git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76827 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/carbon/msgdlg.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osx/carbon/msgdlg.cpp b/src/osx/carbon/msgdlg.cpp index 142581d0f8..7a98a66b81 100644 --- a/src/osx/carbon/msgdlg.cpp +++ b/src/osx/carbon/msgdlg.cpp @@ -160,7 +160,7 @@ int wxMessageDialog::ShowModal() wxCFStringRef cfCancelString( GetCancelLabel().c_str(), GetFont().GetEncoding() ); wxCFStringRef cfTitle( msgtitle, GetFont().GetEncoding() ); - wxCFStringRef cfText = msgtext.IsEmpty() ? NULL : wxCFStringRef( msgtext, GetFont().GetEncoding() ); + wxCFStringRef cfText = msgtext.IsEmpty() ? wxCFStringRef() : wxCFStringRef( msgtext, GetFont().GetEncoding() ); param.movable = true; param.flags = 0;