From 7b68bdce5f9aeec7105d043f53f8ea1060f1070f Mon Sep 17 00:00:00 2001 From: Wayne Stambaugh Date: Sun, 3 Nov 2013 13:15:46 -0500 Subject: [PATCH] Fix debug builds on wxWidgets 2.8. --- .bzrignore | 1 + common/gal/cairo/cairo_compositor.cpp | 2 +- common/gal/cairo/cairo_gal.cpp | 2 +- common/gal/opengl/gpu_manager.cpp | 2 +- pcbnew/tools/item_state.h | 4 ++-- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.bzrignore b/.bzrignore index 1512d59482..2e96f18ee3 100644 --- a/.bzrignore +++ b/.bzrignore @@ -5,6 +5,7 @@ common/netlist_lexer.h common/pcb_plot_params_lexer.h common/page_layout/page_layout_reader_keywords.cpp common/fp_lib_table_keywords.* +common/gal/opengl/shader_src.h include/fp_lib_table_lexer.h include/netlist_lexer.h include/page_layout_reader_lexer.h diff --git a/common/gal/cairo/cairo_compositor.cpp b/common/gal/cairo/cairo_compositor.cpp index 67467dae1a..e749c4db9a 100644 --- a/common/gal/cairo/cairo_compositor.cpp +++ b/common/gal/cairo/cairo_compositor.cpp @@ -78,7 +78,7 @@ unsigned int CAIRO_COMPOSITOR::CreateBuffer() cairo_t* context = cairo_create( surface ); #ifdef __WXDEBUG__ cairo_status_t status = cairo_status( context ); - wxASSERT_MSG( status == CAIRO_STATUS_SUCCESS, "Cairo context creation error" ); + wxASSERT_MSG( status == CAIRO_STATUS_SUCCESS, wxT( "Cairo context creation error" ) ); #endif /* __WXDEBUG__ */ // Set default settings for the buffer diff --git a/common/gal/cairo/cairo_gal.cpp b/common/gal/cairo/cairo_gal.cpp index a12b33dc7c..06cbd62e5a 100644 --- a/common/gal/cairo/cairo_gal.cpp +++ b/common/gal/cairo/cairo_gal.cpp @@ -959,7 +959,7 @@ void CAIRO_GAL::initSurface() context = cairo_create( surface ); #ifdef __WXDEBUG__ cairo_status_t status = cairo_status( context ); - wxASSERT_MSG( status == CAIRO_STATUS_SUCCESS, "Cairo context creation error" ); + wxASSERT_MSG( status == CAIRO_STATUS_SUCCESS, wxT( "Cairo context creation error" ) ); #endif /* __WXDEBUG__ */ currentContext = context; diff --git a/common/gal/opengl/gpu_manager.cpp b/common/gal/opengl/gpu_manager.cpp index 98259db78e..31dcf547ff 100644 --- a/common/gal/opengl/gpu_manager.cpp +++ b/common/gal/opengl/gpu_manager.cpp @@ -46,7 +46,7 @@ GPU_MANAGER* GPU_MANAGER::MakeManager( VERTEX_CONTAINER* aContainer ) else if( typeid( *aContainer ) == typeid( NONCACHED_CONTAINER ) ) return new GPU_NONCACHED_MANAGER( aContainer ); - wxASSERT_MSG( false, "Not handled container type" ); + wxASSERT_MSG( false, wxT( "Not handled container type" ) ); return NULL; } diff --git a/pcbnew/tools/item_state.h b/pcbnew/tools/item_state.h index 61e4e6e767..ed562c623d 100644 --- a/pcbnew/tools/item_state.h +++ b/pcbnew/tools/item_state.h @@ -55,8 +55,8 @@ public: void Save( BOARD_ITEM* aItem ) { #ifdef __WXDEBUG__ - wxASSERT_MSG( m_canSave, "You cannot save items after issuing commands. " - "You have either RestoreAll() or Apply() before adding items!" ); + wxASSERT_MSG( m_canSave, wxT( "You cannot save items after issuing commands. You have " + "either RestoreAll() or Apply() before adding items!" ) ); #endif m_items.push_back( aItem ); }