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

Unicode-related compile fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55845 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2008-09-24 23:44:34 +00:00
parent 5879b22eeb
commit e6ba38871f
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/osx/carbon/font.cpp
View File

@@ -466,7 +466,9 @@ void wxFontRefData::MacFindFont()
float floatnumber; float floatnumber;
CFNumberGetValue( number, kCFNumberFloatType, &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 ); CFShow( dict );
CFRelease( dict ); CFRelease( dict );

2
src/osx/glcanvas_osx.cpp
View File

@@ -167,7 +167,7 @@ bool wxGLCanvasBase::IsExtensionSupported(const char *extension)
WXGLDestroyPixelFormat(fmt); WXGLDestroyPixelFormat(fmt);
WXGLDestroyContext(ctx); WXGLDestroyContext(ctx);
return IsExtensionInList(extensions, extension); return IsExtensionInList(extensions.ToAscii(), extension);
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------