Unicode-related compile fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55845 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/osx/carbon/font.cpp b/src/osx/carbon/font.cpp
index 1a699dcee8afb68b29d9be4f206463998cbed1c7..11fe47b41241ffd52f36c3d61cd2848ef1724aca 100644 (file)
--- 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 154d6ba4cefafcca42e18330edbfcc13fed8f006..5d2c0cd9ed1c2766b838c540553dbd00326cf187 100644 (file)
--- 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);
 }
 
 // ----------------------------------------------------------------------------