From b1144a864faa6536f4d1871443011458a62fbca2 Mon Sep 17 00:00:00 2001 From: Wayne Stambaugh Date: Fri, 12 Apr 2013 09:30:18 +0200 Subject: [PATCH] wxWidgets 2.8.12 build fix --- common/gal/opengl/opengl_gal.cpp | 5 +++-- common/view/view.cpp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/common/gal/opengl/opengl_gal.cpp b/common/gal/opengl/opengl_gal.cpp index e3c3850999..0005035212 100644 --- a/common/gal/opengl/opengl_gal.cpp +++ b/common/gal/opengl/opengl_gal.cpp @@ -29,6 +29,7 @@ #include #include +#include #ifndef CALLBACK #define CALLBACK @@ -256,8 +257,8 @@ void OPENGL_GAL::initGlew() } else { - wxLogDebug( wxString( "Status: Using GLEW " ) + - wxString::FromUTF8( (char*) glewGetString( GLEW_VERSION ) ) ); + wxLogDebug( wxString( wxT( "Status: Using GLEW " ) ) + + FROM_UTF8( (char*) glewGetString( GLEW_VERSION ) ) ); } // Check the OpenGL version (minimum 2.1 is required) diff --git a/common/view/view.cpp b/common/view/view.cpp index 51b3e18dea..339ac77e6e 100644 --- a/common/view/view.cpp +++ b/common/view/view.cpp @@ -429,7 +429,7 @@ void VIEW::redrawRect( const BOX2I& aRect ) prof_end( &totalCycles ); prof_end( &totalRealTime ); - wxLogDebug( "Redraw::items %d (%d cached), %.1f ms/frame (%.0f FPS), draw/geometry ratio: %.1f%%", + wxLogDebug( wxT( "Redraw::items %d (%d cached), %.1f ms/frame (%.0f FPS), draw/geometry ratio: %.1f%%" ), totalItems, totalCached, (double) totalRealTime.value / 1000.0, 1000000.0 / (double) totalRealTime.value, (double) totalDrawTime / (double) totalCycles.value * 100.0 );