haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wxWidgets 2.8.12 build fix

This commit is contained in:
Wayne Stambaugh 2013-04-12 09:30:18 +02:00 committed by Maciej Suminski
parent 3412e82799
commit b1144a864f
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/gal/opengl/opengl_gal.cpp
View File

@ -29,6 +29,7 @@
#include <gal/definitions.h> #include <gal/definitions.h>
#include <wx/log.h> #include <wx/log.h>
#include <macros.h>
#ifndef CALLBACK #ifndef CALLBACK
#define CALLBACK #define CALLBACK
@ -256,8 +257,8 @@ void OPENGL_GAL::initGlew()
} }
else else
{ {
wxLogDebug( wxString( "Status: Using GLEW " ) + wxLogDebug( wxString( wxT( "Status: Using GLEW " ) ) +
wxString::FromUTF8( (char*) glewGetString( GLEW_VERSION ) ) ); FROM_UTF8( (char*) glewGetString( GLEW_VERSION ) ) );
} }
// Check the OpenGL version (minimum 2.1 is required) // Check the OpenGL version (minimum 2.1 is required)

2
common/view/view.cpp
View File

@ -429,7 +429,7 @@ void VIEW::redrawRect( const BOX2I& aRect )
prof_end( &totalCycles ); prof_end( &totalCycles );
prof_end( &totalRealTime ); 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, totalItems, totalCached, (double) totalRealTime.value / 1000.0,
1000000.0 / (double) totalRealTime.value, 1000000.0 / (double) totalRealTime.value,
(double) totalDrawTime / (double) totalCycles.value * 100.0 ); (double) totalDrawTime / (double) totalCycles.value * 100.0 );