Skip to content

K
kicad-source-mirror
Commit b5019b82 authored by Martijn Kuipers's avatar Martijn Kuipers Committed by jean-pierre charras
Browse files
Options

wxLOCALE_LOAD_DEFAULT patch from Martijn Kuipers.

parent 6b05cf31
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
common/edaappl.cpp
View file @ b5019b82
...@@ -666,10 +666,9 @@ bool WinEDA_App::SetLanguage( bool first_time ) ...@@ -666,10 +666,9 @@ bool WinEDA_App::SetLanguage( bool first_time )
delete m_Locale; delete m_Locale;
m_Locale = new wxLocale; m_Locale = new wxLocale;
if( !m_Locale->Init( m_LanguageId, wxLOCALE_CONV_ENCODING ) ) if( !m_Locale->Init( m_LanguageId ) )
{ {
wxLogDebug( wxT( "Failed to initialize " ) + wxLogDebug( wxT("This language is not supported by the system.") );
wxLocale::GetLanguageInfo( m_LanguageId )->Description );
m_LanguageId = wxLANGUAGE_DEFAULT; m_LanguageId = wxLANGUAGE_DEFAULT;
delete m_Locale; delete m_Locale;
......
pcbnew/editrack.cpp
View file @ b5019b82
...@@ -720,7 +720,8 @@ void ShowNewTrackWhenMovingCursor( WinEDA_DrawPanel* panel, ...@@ -720,7 +720,8 @@ void ShowNewTrackWhenMovingCursor( WinEDA_DrawPanel* panel,
// Set track parameters, that can be modified while creating the track // Set track parameters, that can be modified while creating the track
g_CurrentTrackSegment->SetLayer( screen->m_Active_Layer ); g_CurrentTrackSegment->SetLayer( screen->m_Active_Layer );
g_CurrentTrackSegment->m_Width = frame->GetBoard()->GetCurrentTrackWidth(); if( !frame->GetBoard()->GetBoardDesignSettings()->m_UseConnectedTrackWidth )
g_CurrentTrackSegment->m_Width = frame->GetBoard()->GetCurrentTrackWidth();
if( g_TwoSegmentTrackBuild ) if( g_TwoSegmentTrackBuild )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment