diff --git a/include/board_item.h b/include/board_item.h index d1ca06416e..7fd064ebf3 100644 --- a/include/board_item.h +++ b/include/board_item.h @@ -147,7 +147,7 @@ public: virtual LSET GetLayerSet() const { return LSET( m_layer ); } virtual void SetLayerSet( LSET aLayers ) { - wxFAIL_MSG( "Attempted to SetLayerSet() on a single-layer object." ); + wxFAIL_MSG( wxT( "Attempted to SetLayerSet() on a single-layer object." ) ); // Derived classes which support multiple layers must implement this } @@ -231,7 +231,7 @@ public: */ virtual void Move( const wxPoint& aMoveVector ) { - wxFAIL_MSG( "virtual BOARD_ITEM::Move called for " + GetClass() ); + wxFAIL_MSG( wxT( "virtual BOARD_ITEM::Move called for " ) + GetClass() ); } void Move( const VECTOR2I& aMoveVector ) diff --git a/include/core/kicad_algo.h b/include/core/kicad_algo.h index 430612e9c2..d959adde89 100644 --- a/include/core/kicad_algo.h +++ b/include/core/kicad_algo.h @@ -127,7 +127,7 @@ bool pair_contains( const std::pair<_Type, _Type> __pair, _Value __value ) template bool within_wrapped_range( T __val, T __minval, T __maxval, T __wrap ) { - wxCHECK_MSG( __wrap > 0, false, "Wrap must be positive!" ); + wxCHECK_MSG( __wrap > 0, false, wxT( "Wrap must be positive!" ) ); while( __maxval >= __wrap ) __maxval -= __wrap; diff --git a/include/gbr_netlist_metadata.h b/include/gbr_netlist_metadata.h index 7a98b5d9fd..a6f8c5c91a 100644 --- a/include/gbr_netlist_metadata.h +++ b/include/gbr_netlist_metadata.h @@ -198,7 +198,7 @@ public: return; } - if( !aName || aName->IsEmpty() || *aName == ".CN" ) + if( !aName || aName->IsEmpty() || *aName == wxT( ".CN" ) ) { m_NetAttribType = GBR_NETINFO_UNSPECIFIED; m_Padname.clear(); @@ -208,21 +208,21 @@ public: return; } - if( *aName == ".C" ) + if( *aName == wxT( ".C" ) ) { m_NetAttribType &= ~GBR_NETINFO_CMP; m_Cmpref.clear(); return; } - if( *aName == ".N" ) + if( *aName == wxT( ".N" ) ) { m_NetAttribType &= ~GBR_NETINFO_NET; m_Netname.clear(); return; } - if( *aName == ".P" ) + if( *aName == wxT( ".P" ) ) { m_NetAttribType &= ~GBR_NETINFO_PAD; m_Padname.clear(); diff --git a/include/macros.h b/include/macros.h index bc1d6d3d80..f22994a4bd 100644 --- a/include/macros.h +++ b/include/macros.h @@ -118,6 +118,6 @@ static inline wxString FROM_UTF8( const char* cstring ) } #define UNIMPLEMENTED_FOR( type ) \ - wxFAIL_MSG( wxString::Format( "%s: unimplemented for %s", __FUNCTION__, type ) ) + wxFAIL_MSG( wxString::Format( wxT( "%s: unimplemented for %s" ), __FUNCTION__, type ) ) #endif // MACROS_H diff --git a/include/multivector.h b/include/multivector.h index 442c54e9b0..7011bc5859 100644 --- a/include/multivector.h +++ b/include/multivector.h @@ -266,7 +266,7 @@ public: { if( ( aType < FIRST_TYPE ) || ( aType > LAST_TYPE ) ) { - wxFAIL_MSG( "Attempted access to type not within MULTIVECTOR" ); + wxFAIL_MSG( wxT( "Attempted access to type not within MULTIVECTOR" ) ); // return type is a reference so we have to return something... aType = FIRST_TYPE; @@ -279,7 +279,7 @@ public: { if( ( aType < FIRST_TYPE ) || ( aType > LAST_TYPE ) ) { - wxFAIL_MSG( "Attempted access to type not within MULTIVECTOR" ); + wxFAIL_MSG( wxT( "Attempted access to type not within MULTIVECTOR" ) ); // return type is a reference so we have to return something... aType = FIRST_TYPE; diff --git a/include/pcb_base_frame.h b/include/pcb_base_frame.h index 67a509f16a..aa89dabdb8 100644 --- a/include/pcb_base_frame.h +++ b/include/pcb_base_frame.h @@ -165,7 +165,7 @@ public: */ virtual COLOR_SETTINGS* GetColorSettings() const override { - wxFAIL_MSG( "Color settings requested for a PCB_BASE_FRAME that does not override!" ); + wxFAIL_MSG( wxT( "Color settings requested for a PCB_BASE_FRAME that does not override!" ) ); return nullptr; } diff --git a/include/pcb_group.h b/include/pcb_group.h index d658f31985..d7cffd9072 100644 --- a/include/pcb_group.h +++ b/include/pcb_group.h @@ -121,7 +121,7 @@ public: ///< @copydoc BOARD_ITEM::SetLayer void SetLayer( PCB_LAYER_ID aLayer ) override { - wxFAIL_MSG( "groups don't support layer SetLayer" ); + wxFAIL_MSG( wxT( "groups don't support layer SetLayer" ) ); } /** Set layer for all items within the group. diff --git a/include/property.h b/include/property.h index 55359045e8..b6f37fd7ca 100644 --- a/include/property.h +++ b/include/property.h @@ -394,7 +394,7 @@ public: if ( std::is_enum::value ) { m_choices = ENUM_MAP::Instance().Choices(); - wxASSERT_MSG( m_choices.GetCount() > 0, "No enum choices defined" ); + wxASSERT_MSG( m_choices.GetCount() > 0, wxT( "No enum choices defined" ) ); } } @@ -408,7 +408,7 @@ public: if ( std::is_enum::value ) { m_choices = ENUM_MAP::Instance().Choices(); - wxASSERT_MSG( m_choices.GetCount() > 0, "No enum choices defined" ); + wxASSERT_MSG( m_choices.GetCount() > 0, wxT( "No enum choices defined" ) ); } } diff --git a/include/tool/coroutine.h b/include/tool/coroutine.h index dc2aad387c..fe086ef413 100644 --- a/include/tool/coroutine.h +++ b/include/tool/coroutine.h @@ -291,7 +291,7 @@ public: { INVOCATION_ARGS args{ INVOCATION_ARGS::FROM_ROUTINE, this, aCor.m_callContext }; - wxLogTrace( kicadTraceCoroutineStack, "COROUTINE::Call (from routine)" ); + wxLogTrace( kicadTraceCoroutineStack, wxT( "COROUTINE::Call (from routine)" ) ); doCall( &args, aArg ); // we will not be asked to continue @@ -318,7 +318,7 @@ public: m_caller.own_tsan_fiber = false; #endif - wxLogTrace( kicadTraceCoroutineStack, "COROUTINE::Resume (from root)" ); + wxLogTrace( kicadTraceCoroutineStack, wxT( "COROUTINE::Resume (from root)" ) ); ctx.Continue( doResume( &args ) ); @@ -337,7 +337,7 @@ public: { INVOCATION_ARGS args{ INVOCATION_ARGS::FROM_ROUTINE, this, aCor.m_callContext }; - wxLogTrace( kicadTraceCoroutineStack, "COROUTINE::Resume (from routine)" ); + wxLogTrace( kicadTraceCoroutineStack, wxT( "COROUTINE::Resume (from routine)" ) ); doResume( &args ); // we will not be asked to continue @@ -398,7 +398,7 @@ private: __tsan_set_fiber_name( m_callee.tsan_fiber, "Coroutine fiber" ); #endif - wxLogTrace( kicadTraceCoroutineStack, "COROUTINE::doCall" ); + wxLogTrace( kicadTraceCoroutineStack, wxT( "COROUTINE::doCall" ) ); m_callee.ctx = libcontext::make_fcontext( sp, stackSize, callerStub ); m_running = true; @@ -439,7 +439,7 @@ private: __tsan_switch_to_fiber( m_callee.tsan_fiber, 0 ); #endif - wxLogTrace( kicadTraceCoroutineStack, "COROUTINE::jumpIn" ); + wxLogTrace( kicadTraceCoroutineStack, wxT( "COROUTINE::jumpIn" ) ); args = reinterpret_cast( libcontext::jump_fcontext( &( m_caller.ctx ), m_callee.ctx, @@ -459,7 +459,7 @@ private: __tsan_switch_to_fiber( m_caller.tsan_fiber, 0 ); #endif - wxLogTrace( kicadTraceCoroutineStack, "COROUTINE::jumpOut" ); + wxLogTrace( kicadTraceCoroutineStack, wxT( "COROUTINE::jumpOut" ) ); ret = reinterpret_cast( libcontext::jump_fcontext( &( m_callee.ctx ), m_caller.ctx, diff --git a/include/validators.h b/include/validators.h index 5422dca106..86d9616d5e 100644 --- a/include/validators.h +++ b/include/validators.h @@ -179,7 +179,7 @@ public: LIB_ID_VALIDATOR( wxString* aValue = nullptr ) : wxTextValidator( wxFILTER_EXCLUDE_CHAR_LIST, aValue ) { - SetCharExcludes( "\r\n\t" ); + SetCharExcludes( wxT( "\r\n\t" ) ); } virtual wxObject* Clone() const override