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

Fix debug builds on wxWidgets 2.8.

This commit is contained in:
Wayne Stambaugh 2013-11-03 13:15:46 -05:00
parent e9f41a3b98
commit fe54ceacab
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.bzrignore
View File

@ -5,6 +5,7 @@ common/netlist_lexer.h
common/pcb_plot_params_lexer.h common/pcb_plot_params_lexer.h
common/page_layout/page_layout_reader_keywords.cpp common/page_layout/page_layout_reader_keywords.cpp
common/fp_lib_table_keywords.* common/fp_lib_table_keywords.*
common/gal/opengl/shader_src.h
include/fp_lib_table_lexer.h include/fp_lib_table_lexer.h
include/netlist_lexer.h include/netlist_lexer.h
include/page_layout_reader_lexer.h include/page_layout_reader_lexer.h

2
common/gal/cairo/cairo_compositor.cpp
View File

@ -78,7 +78,7 @@ unsigned int CAIRO_COMPOSITOR::CreateBuffer()
cairo_t* context = cairo_create( surface ); cairo_t* context = cairo_create( surface );
#ifdef __WXDEBUG__ #ifdef __WXDEBUG__
cairo_status_t status = cairo_status( context ); 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__ */ #endif /* __WXDEBUG__ */
// Set default settings for the buffer // Set default settings for the buffer

2
common/gal/cairo/cairo_gal.cpp
View File

@ -959,7 +959,7 @@ void CAIRO_GAL::initSurface()
context = cairo_create( surface ); context = cairo_create( surface );
#ifdef __WXDEBUG__ #ifdef __WXDEBUG__
cairo_status_t status = cairo_status( context ); 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__ */ #endif /* __WXDEBUG__ */
currentContext = context; currentContext = context;

2
common/gal/opengl/gpu_manager.cpp
View File

@ -46,7 +46,7 @@ GPU_MANAGER* GPU_MANAGER::MakeManager( VERTEX_CONTAINER* aContainer )
else if( typeid( *aContainer ) == typeid( NONCACHED_CONTAINER ) ) else if( typeid( *aContainer ) == typeid( NONCACHED_CONTAINER ) )
return new GPU_NONCACHED_MANAGER( aContainer ); return new GPU_NONCACHED_MANAGER( aContainer );
wxASSERT_MSG( false, "Not handled container type" ); wxASSERT_MSG( false, wxT( "Not handled container type" ) );
return NULL; return NULL;
} }

4
pcbnew/tools/item_state.h
View File

@ -55,8 +55,8 @@ public:
void Save( BOARD_ITEM* aItem ) void Save( BOARD_ITEM* aItem )
{ {
#ifdef __WXDEBUG__ #ifdef __WXDEBUG__
wxASSERT_MSG( m_canSave, "You cannot save items after issuing commands. " wxASSERT_MSG( m_canSave, wxT( "You cannot save items after issuing commands. You have "
"You have either RestoreAll() or Apply() before adding items!" ); "either RestoreAll() or Apply() before adding items!" ) );
#endif #endif
m_items.push_back( aItem ); m_items.push_back( aItem );
} }