More wxT-ification.
This commit is contained in:
parent
9a654ec8b9
commit
2250211ebf
|
@ -166,7 +166,7 @@ public:
|
||||||
|
|
||||||
virtual void SetLayerSet( LSET aLayers )
|
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
|
// Derived classes which support multiple layers must implement this
|
||||||
}
|
}
|
||||||
|
@ -250,7 +250,7 @@ public:
|
||||||
*/
|
*/
|
||||||
virtual void Move( const VECTOR2I& aMoveVector )
|
virtual void Move( const VECTOR2I& aMoveVector )
|
||||||
{
|
{
|
||||||
wxFAIL_MSG( "virtual BOARD_ITEM::Move called for " + GetClass() );
|
wxFAIL_MSG( wxT( "virtual BOARD_ITEM::Move called for " ) + GetClass() );
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -127,7 +127,7 @@ bool pair_contains( const std::pair<_Type, _Type> __pair, _Value __value )
|
||||||
template <class T>
|
template <class T>
|
||||||
bool within_wrapped_range( T __val, T __minval, T __maxval, T __wrap )
|
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 )
|
while( __maxval >= __wrap )
|
||||||
__maxval -= __wrap;
|
__maxval -= __wrap;
|
||||||
|
|
|
@ -198,7 +198,7 @@ public:
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if( !aName || aName->IsEmpty() || *aName == ".CN" )
|
if( !aName || aName->IsEmpty() || *aName == wxT( ".CN" ) )
|
||||||
{
|
{
|
||||||
m_NetAttribType = GBR_NETINFO_UNSPECIFIED;
|
m_NetAttribType = GBR_NETINFO_UNSPECIFIED;
|
||||||
m_Padname.clear();
|
m_Padname.clear();
|
||||||
|
@ -208,21 +208,21 @@ public:
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if( *aName == ".C" )
|
if( *aName == wxT( ".C" ) )
|
||||||
{
|
{
|
||||||
m_NetAttribType &= ~GBR_NETINFO_CMP;
|
m_NetAttribType &= ~GBR_NETINFO_CMP;
|
||||||
m_Cmpref.clear();
|
m_Cmpref.clear();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if( *aName == ".N" )
|
if( *aName == wxT( ".N" ) )
|
||||||
{
|
{
|
||||||
m_NetAttribType &= ~GBR_NETINFO_NET;
|
m_NetAttribType &= ~GBR_NETINFO_NET;
|
||||||
m_Netname.clear();
|
m_Netname.clear();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if( *aName == ".P" )
|
if( *aName == wxT( ".P" ) )
|
||||||
{
|
{
|
||||||
m_NetAttribType &= ~GBR_NETINFO_PAD;
|
m_NetAttribType &= ~GBR_NETINFO_PAD;
|
||||||
m_Padname.clear();
|
m_Padname.clear();
|
||||||
|
|
|
@ -118,6 +118,6 @@ static inline wxString FROM_UTF8( const char* cstring )
|
||||||
}
|
}
|
||||||
|
|
||||||
#define UNIMPLEMENTED_FOR( type ) \
|
#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
|
#endif // MACROS_H
|
||||||
|
|
|
@ -266,7 +266,7 @@ public:
|
||||||
{
|
{
|
||||||
if( ( aType < FIRST_TYPE ) || ( aType > LAST_TYPE ) )
|
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...
|
// return type is a reference so we have to return something...
|
||||||
aType = FIRST_TYPE;
|
aType = FIRST_TYPE;
|
||||||
|
@ -279,7 +279,7 @@ public:
|
||||||
{
|
{
|
||||||
if( ( aType < FIRST_TYPE ) || ( aType > LAST_TYPE ) )
|
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...
|
// return type is a reference so we have to return something...
|
||||||
aType = FIRST_TYPE;
|
aType = FIRST_TYPE;
|
||||||
|
|
|
@ -161,7 +161,7 @@ public:
|
||||||
*/
|
*/
|
||||||
virtual COLOR_SETTINGS* GetColorSettings( bool aForceRefresh = false ) const override
|
virtual COLOR_SETTINGS* GetColorSettings( bool aForceRefresh = false ) 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;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -121,7 +121,7 @@ public:
|
||||||
///< @copydoc BOARD_ITEM::SetLayer
|
///< @copydoc BOARD_ITEM::SetLayer
|
||||||
void SetLayer( PCB_LAYER_ID aLayer ) override
|
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.
|
/** Set layer for all items within the group.
|
||||||
|
|
|
@ -394,7 +394,7 @@ public:
|
||||||
if ( std::is_enum<T>::value )
|
if ( std::is_enum<T>::value )
|
||||||
{
|
{
|
||||||
m_choices = ENUM_MAP<T>::Instance().Choices();
|
m_choices = ENUM_MAP<T>::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<T>::value )
|
if ( std::is_enum<T>::value )
|
||||||
{
|
{
|
||||||
m_choices = ENUM_MAP<T>::Instance().Choices();
|
m_choices = ENUM_MAP<T>::Instance().Choices();
|
||||||
wxASSERT_MSG( m_choices.GetCount() > 0, "No enum choices defined" );
|
wxASSERT_MSG( m_choices.GetCount() > 0, wxT( "No enum choices defined" ) );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -291,7 +291,7 @@ public:
|
||||||
{
|
{
|
||||||
INVOCATION_ARGS args{ INVOCATION_ARGS::FROM_ROUTINE, this, aCor.m_callContext };
|
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 );
|
doCall( &args, aArg );
|
||||||
// we will not be asked to continue
|
// we will not be asked to continue
|
||||||
|
@ -318,7 +318,7 @@ public:
|
||||||
m_caller.own_tsan_fiber = false;
|
m_caller.own_tsan_fiber = false;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
wxLogTrace( kicadTraceCoroutineStack, "COROUTINE::Resume (from root)" );
|
wxLogTrace( kicadTraceCoroutineStack, wxT( "COROUTINE::Resume (from root)" ) );
|
||||||
|
|
||||||
ctx.Continue( doResume( &args ) );
|
ctx.Continue( doResume( &args ) );
|
||||||
|
|
||||||
|
@ -337,7 +337,7 @@ public:
|
||||||
{
|
{
|
||||||
INVOCATION_ARGS args{ INVOCATION_ARGS::FROM_ROUTINE, this, aCor.m_callContext };
|
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 );
|
doResume( &args );
|
||||||
// we will not be asked to continue
|
// we will not be asked to continue
|
||||||
|
@ -398,7 +398,7 @@ private:
|
||||||
__tsan_set_fiber_name( m_callee.tsan_fiber, "Coroutine fiber" );
|
__tsan_set_fiber_name( m_callee.tsan_fiber, "Coroutine fiber" );
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
wxLogTrace( kicadTraceCoroutineStack, "COROUTINE::doCall" );
|
wxLogTrace( kicadTraceCoroutineStack, wxT( "COROUTINE::doCall" ) );
|
||||||
|
|
||||||
m_callee.ctx = libcontext::make_fcontext( sp, stackSize, callerStub );
|
m_callee.ctx = libcontext::make_fcontext( sp, stackSize, callerStub );
|
||||||
m_running = true;
|
m_running = true;
|
||||||
|
@ -439,7 +439,7 @@ private:
|
||||||
__tsan_switch_to_fiber( m_callee.tsan_fiber, 0 );
|
__tsan_switch_to_fiber( m_callee.tsan_fiber, 0 );
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
wxLogTrace( kicadTraceCoroutineStack, "COROUTINE::jumpIn" );
|
wxLogTrace( kicadTraceCoroutineStack, wxT( "COROUTINE::jumpIn" ) );
|
||||||
|
|
||||||
args = reinterpret_cast<INVOCATION_ARGS*>(
|
args = reinterpret_cast<INVOCATION_ARGS*>(
|
||||||
libcontext::jump_fcontext( &( m_caller.ctx ), m_callee.ctx,
|
libcontext::jump_fcontext( &( m_caller.ctx ), m_callee.ctx,
|
||||||
|
@ -459,7 +459,7 @@ private:
|
||||||
__tsan_switch_to_fiber( m_caller.tsan_fiber, 0 );
|
__tsan_switch_to_fiber( m_caller.tsan_fiber, 0 );
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
wxLogTrace( kicadTraceCoroutineStack, "COROUTINE::jumpOut" );
|
wxLogTrace( kicadTraceCoroutineStack, wxT( "COROUTINE::jumpOut" ) );
|
||||||
|
|
||||||
ret = reinterpret_cast<INVOCATION_ARGS*>(
|
ret = reinterpret_cast<INVOCATION_ARGS*>(
|
||||||
libcontext::jump_fcontext( &( m_callee.ctx ), m_caller.ctx,
|
libcontext::jump_fcontext( &( m_callee.ctx ), m_caller.ctx,
|
||||||
|
|
|
@ -179,7 +179,7 @@ public:
|
||||||
LIB_ID_VALIDATOR( wxString* aValue = nullptr ) :
|
LIB_ID_VALIDATOR( wxString* aValue = nullptr ) :
|
||||||
wxTextValidator( wxFILTER_EXCLUDE_CHAR_LIST, aValue )
|
wxTextValidator( wxFILTER_EXCLUDE_CHAR_LIST, aValue )
|
||||||
{
|
{
|
||||||
SetCharExcludes( "\r\n\t" );
|
SetCharExcludes( wxT( "\r\n\t" ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual wxObject* Clone() const override
|
virtual wxObject* Clone() const override
|
||||||
|
|
Loading…
Reference in New Issue