From 2bc0a4476400828fc25355f9410c8db0712614d1 Mon Sep 17 00:00:00 2001 From: Dick Hollenbeck Date: Thu, 24 Apr 2014 12:25:57 -0500 Subject: [PATCH] comment fix, simplified unhandled IO_ERROR exception report in single_top.cpp. --- CMakeLists.txt | 23 ++++++++++++----------- common/kiway.cpp | 4 ++-- common/single_top.cpp | 4 +--- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5c061111f3..092cae2587 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -621,7 +621,6 @@ add_subdirectory( 3d-viewer ) add_subdirectory( cvpcb ) add_subdirectory( eeschema ) add_subdirectory( gerbview ) -add_subdirectory( kicad ) add_subdirectory( lib_dxf ) add_subdirectory( pcbnew ) add_subdirectory( polygon ) @@ -629,9 +628,11 @@ add_subdirectory( pagelayout_editor ) add_subdirectory( potrace ) add_subdirectory( bitmap2component ) add_subdirectory( pcb_calculator ) +add_subdirectory( kicad ) # should follow pcbnew, eeschema add_subdirectory( tools ) add_subdirectory( utils ) add_subdirectory( qa ) + #add_subdirectory( new ) @@ -651,16 +652,16 @@ add_dependencies( pnsrouter boost ) if ( KICAD_BUILD_STATIC OR KICAD_BUILD_DYNAMIC ) -add_dependencies( pcbnew lib-dependencies ) -add_dependencies( eeschema lib-dependencies ) -add_dependencies( cvpcb lib-dependencies ) -add_dependencies( common lib-dependencies ) -add_dependencies( gal lib-dependencies ) -add_dependencies( pcbcommon lib-dependencies ) -add_dependencies( 3d-viewer lib-dependencies ) -add_dependencies( pcad2kicadpcb lib-dependencies ) -add_dependencies( pl_editor lib-dependencies ) -add_dependencies( pnsrouter lib-dependencies ) + add_dependencies( pcbnew lib-dependencies ) + add_dependencies( eeschema lib-dependencies ) + add_dependencies( cvpcb lib-dependencies ) + add_dependencies( common lib-dependencies ) + add_dependencies( gal lib-dependencies ) + add_dependencies( pcbcommon lib-dependencies ) + add_dependencies( 3d-viewer lib-dependencies ) + add_dependencies( pcad2kicadpcb lib-dependencies ) + add_dependencies( pl_editor lib-dependencies ) + add_dependencies( pnsrouter lib-dependencies ) endif() if ( KICAD_BUILD_DYNAMIC ) diff --git a/common/kiway.cpp b/common/kiway.cpp index 8e5966506c..13c0072a92 100644 --- a/common/kiway.cpp +++ b/common/kiway.cpp @@ -198,8 +198,8 @@ KIFACE* KIWAY::KiFACE( FACE_T aFaceId, bool doLoad ) // This is a fatal error, one from which we cannot recover, nor do we want // to protect against in client code which would require numerous noisy // tests in numerous places. So we inform the user that the installation - // is bad. This exception will likely not get caught until way up in - // PGM_BASE or a derivative, at which point the process will exit gracefully. + // is bad. This exception will likely not get caught until way up in the + // wxApp derivative, at which point the process will exit gracefully. THROW_IO_ERROR( msg ); } diff --git a/common/single_top.cpp b/common/single_top.cpp index 0200170b10..c153f891d4 100644 --- a/common/single_top.cpp +++ b/common/single_top.cpp @@ -176,9 +176,7 @@ struct APP_SINGLE_TOP : public wxApp } catch( const IO_ERROR& ioe ) { - wxLogError( wxT( "Unhandled exception class: %s what: %s" ), - GetChars( FROM_UTF8( typeid( ioe ).name() ) ), - GetChars( ioe.errorText ) ); + wxLogError( GetChars( ioe.errorText ) ); } catch(...) {