Commit 89e7f965 authored by charras's avatar charras
Browse files

made kicad compilable with wxWidgets 2.9 (wxWidgets 3)

parent f3e4682f

common/confirm.cpp

+3 −6
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ bool IsOK( wxWindow* parent, const wxString& text ) 
/***********************************************************************/

int Get_Message( const wxString& title,                // The question

                 const wxString& frame_caption,        // The frame caption

                 wxString& buffer,                     // String input buffer

                 wxString& buffer,                     // String input/return buffer

                 wxWindow* frame )

/***********************************************************************/
@@ -140,13 +140,10 @@ int Get_Message( const wxString& title, // The question 
 *          != 0 if ESCAPE

 */

{

    wxString message, default_text;



    if( buffer )

        default_text = buffer;

    wxString message;



    message = wxGetTextFromUser( title, frame_caption,

                                 default_text, frame );

                                 buffer, frame );

    if( !message.IsEmpty() )

    {

        message.Trim( FALSE );      // Remove blanks at beginning

common/copy_to_clipboard.cpp

+19 −27
Original line number Diff line number Diff line
@@ -94,13 +94,6 @@ bool DrawPage( WinEDA_DrawPanel* panel ) 


    wxMetafileDC dc /*(wxT(""), DrawArea.GetWidth(), DrawArea.GetHeight())*/;



    if( !dc.Ok() )

    {

        DisplayError( NULL, wxT( "CopyToClipboard: DrawPage error: wxMetafileDC not OK" ) );

        success = FALSE;

    }

    else

    {

    EDA_Rect tmp = panel->m_ClipBox;

    GRResetPenAndBrush( &dc );

    GRForceBlackPen( s_PlotBlackAndWhite );
@@ -124,7 +117,6 @@ bool DrawPage( WinEDA_DrawPanel* panel ) 
        success = mf->SetClipboard( ClipboardSizeX, ClipboardSizeY );

        delete mf;

    }

    }





    GRForceBlackPen( FALSE );

common/dcsvg.cpp

+9 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
/////////////////////////////////////////////////////////////////////////////







// For compilers that support precompilation, includes "wx/wx.h".

#include "wx/wxprec.h"
@@ -19,6 +20,12 @@ 
#include "wx/wx.h"

#endif



#if wxCHECK_VERSION( 2, 9, 0 )

// Do nothing, because wxWidgets 3 supports the SVG format

// previously, was a contribution library, not included in wxWidgets base



#else



#include "dcsvg.h"



#include "wx/image.h"
@@ -979,3 +986,5 @@ void wxSVGFileDC::write( const wxString& s ) 
#pragma warn .rch

#pragma warn .ccc

#endif



#endif // wxCHECK_VERSION

common/drawtxt.cpp

+9 −6
Original line number Diff line number Diff line
@@ -304,14 +304,17 @@ void DrawGraphicText( WinEDA_DrawPanel* aPanel, 
		continue; /* Skip ~ processing */

	    }

	}



	AsciiCode = aText.GetChar(ptr+overbars);



#if defined(wxUSE_UNICODE) && defined(KICAD_CYRILLIC)

	AsciiCode = aText.GetChar(ptr+overbars) & 0x7FF;

    AsciiCode &= 0x7FF;

	if ( AsciiCode > 0x40F && AsciiCode < 0x450 ) // big small Cyr

	    AsciiCode = utf8_to_ascii[AsciiCode - 0x410] & 0xFF;

	else

	    AsciiCode = AsciiCode & 0xFF;

#else

        AsciiCode = aText.GetChar(ptr+overbars) & 0xFF;

        AsciiCode &= 0xFF;

#endif

        ptcar = graphic_fonte_shape[AsciiCode];  /* ptcar pointe la description

                                                  *  du caractere a dessiner */

common/edaappl.cpp

+10 −3
Original line number Diff line number Diff line
@@ -698,6 +698,10 @@ void WinEDA_App::SaveSettings() 
    /* Sdt font settings */

    m_EDA_Config->Write( wxT( "SdtFontSize" ), g_StdFontPointSize );

    m_EDA_Config->Write( wxT( "SdtFontType" ), g_StdFont->GetFaceName() );



#if wxCHECK_VERSION( 2, 9, 0 )

#warning under wxWidgets 3.0, see how to replace the next lines

#else

    m_EDA_Config->Write( wxT( "SdtFontStyle" ), g_StdFont->GetStyle() );

    m_EDA_Config->Write( wxT( "SdtFontWeight" ), g_StdFont->GetWeight() );
@@ -717,6 +721,7 @@ void WinEDA_App::SaveSettings() 
    m_EDA_Config->Write( wxT( "FixedFontSize" ), g_FixedFontPointSize );

    m_EDA_Config->Write( wxT( "ShowPageLimits" ), g_ShowPageLimits );

    m_EDA_Config->Write( wxT( "WorkingDir" ), wxGetCwd() );

#endif // wxCHECK_VERSION



    /* Save the file history list */

    m_fileHistory.Save( *m_EDA_Config );
@@ -857,9 +862,11 @@ void WinEDA_App::AddMenuLanguageList( wxMenu* MasterMenu ) 
    menu = new wxMenu;

    for( ii = 0; ii < LANGUAGE_DESCR_COUNT; ii++ )

    {

        wxString label = s_Language_List[ii].m_DoNotTranslate ?

                         s_Language_List[ii].m_Lang_Label :

                         wxGetTranslation( s_Language_List[ii].m_Lang_Label );

        wxString label;

        if ( s_Language_List[ii].m_DoNotTranslate )

            label = s_Language_List[ii].m_Lang_Label;

        else

            label = wxGetTranslation( s_Language_List[ii].m_Lang_Label );



        item = new wxMenuItem( menu,

                               s_Language_List[ii].m_KI_Lang_Identifier,