From e6ba38871f6cc5c02391c04e37e481d0428cef3f Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Wed, 24 Sep 2008 23:44:34 +0000 Subject: [PATCH] Unicode-related compile fixes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55845 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/carbon/font.cpp | 4 +++- src/osx/glcanvas_osx.cpp | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/osx/carbon/font.cpp b/src/osx/carbon/font.cpp index 1a699dcee8..11fe47b412 100644 --- a/src/osx/carbon/font.cpp +++ b/src/osx/carbon/font.cpp @@ -466,7 +466,9 @@ void wxFontRefData::MacFindFont() float floatnumber; CFNumberGetValue( number, kCFNumberFloatType, &floatnumber ); { - printf( wxString::Format( "font %s expected %d but got %d traits, %f angle \n" , m_faceName.c_str(), traits, received, angle ) ); + wxString msg = wxString::Format( "font %s expected %d but got %d traits, %f angle \n" , + m_faceName.c_str(), traits, received, angle ); + printf( msg.c_str() ); } CFShow( dict ); CFRelease( dict ); diff --git a/src/osx/glcanvas_osx.cpp b/src/osx/glcanvas_osx.cpp index 154d6ba4ce..5d2c0cd9ed 100644 --- a/src/osx/glcanvas_osx.cpp +++ b/src/osx/glcanvas_osx.cpp @@ -167,7 +167,7 @@ bool wxGLCanvasBase::IsExtensionSupported(const char *extension) WXGLDestroyPixelFormat(fmt); WXGLDestroyContext(ctx); - return IsExtensionInList(extensions, extension); + return IsExtensionInList(extensions.ToAscii(), extension); } // ---------------------------------------------------------------------------- -- 2.45.2