Commit b5019b82 authored by Martijn Kuipers's avatar Martijn Kuipers Committed by jean-pierre charras
Browse files

wxLOCALE_LOAD_DEFAULT patch from Martijn Kuipers.

parent 6b05cf31

common/edaappl.cpp

+2 −3
Original line number Diff line number Diff line
@@ -666,10 +666,9 @@ bool WinEDA_App::SetLanguage( bool first_time ) 
        delete m_Locale;

    m_Locale = new wxLocale;



    if( !m_Locale->Init( m_LanguageId, wxLOCALE_CONV_ENCODING ) )

    if( !m_Locale->Init( m_LanguageId ) )

    {

        wxLogDebug( wxT( "Failed to initialize " ) +

                    wxLocale::GetLanguageInfo( m_LanguageId )->Description );

        wxLogDebug( wxT("This language is not supported by the system.") );



        m_LanguageId = wxLANGUAGE_DEFAULT;

        delete m_Locale;

pcbnew/editrack.cpp

+2 −1
Original line number Diff line number Diff line
@@ -720,6 +720,7 @@ void ShowNewTrackWhenMovingCursor( WinEDA_DrawPanel* panel, 


    // Set track parameters, that can be modified while creating the track

    g_CurrentTrackSegment->SetLayer( screen->m_Active_Layer );

    if( !frame->GetBoard()->GetBoardDesignSettings()->m_UseConnectedTrackWidth )

        g_CurrentTrackSegment->m_Width = frame->GetBoard()->GetCurrentTrackWidth();



    if( g_TwoSegmentTrackBuild )