Commit 657325be authored by charras's avatar charras
Browse files

Changed some c_str and GetData functions to GetChars in .Printf functions

parent b1a8a074

3d-viewer/3d_read_mesh.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -44,7 +44,7 @@ int S3D_MASTER:: ReadData() 
        if( FullFilename.IsEmpty() )

        if( FullFilename.IsEmpty() )

        {

        {

            wxLogDebug( _( "3D part library <%s> could not be found." ),

            wxLogDebug( _( "3D part library <%s> could not be found." ),

                        fn.GetFullPath().c_str() );

                        GetChars( fn.GetFullPath() ) );

            return -1;

            return -1;

        }

        }

    }

    }

common/basicframe.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -259,7 +259,7 @@ void WinEDA_BasicFrame::GetKicadHelp( wxCommandEvent& event ) 
    }

    }

    else

    else

    {

    {

        msg.Printf( _( "Help file %s not found" ), wxGetApp().m_HelpFileName.GetData() );

        msg.Printf( _( "Help file %s not found" ), GetChars( wxGetApp().m_HelpFileName ) );

        DisplayError( this, msg );

        DisplayError( this, msg );

    }

    }
@@ -268,7 +268,7 @@ void WinEDA_BasicFrame::GetKicadHelp( wxCommandEvent& event ) 
    if( !helpFile )

    if( !helpFile )

    {

    {

        msg.Printf( _( "Help file %s could not be found." ),

        msg.Printf( _( "Help file %s could not be found." ),

                    wxGetApp().m_HelpFileName.c_str() );

                    GetChars( wxGetApp().m_HelpFileName ) );

        DisplayError( this, msg );

        DisplayError( this, msg );

    }

    }

    else

    else

common/common.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -469,7 +469,7 @@ wxString GenDate() 
    time( &buftime );

    time( &buftime );

    Date = gmtime( &buftime );

    Date = gmtime( &buftime );

    string_date.Printf( wxT( "%d %s %d" ), Date->tm_mday,

    string_date.Printf( wxT( "%d %s %d" ), Date->tm_mday,

                        mois[Date->tm_mon].GetData(),

                        GetChars( mois[Date->tm_mon] ),

                        Date->tm_year + 1900 );

                        Date->tm_year + 1900 );

    return string_date;

    return string_date;

}

}

common/dcsvg.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -907,7 +907,7 @@ void wxSVGFileDC::DoDrawBitmap( const class wxBitmap& bmp, 
    int      h = myBitmap.GetHeight();

    int      h = myBitmap.GetHeight();

    sTmp.Printf( wxT( " <image x=\"%d\" y=\"%d\" width=\"%dpx\" height=\"%dpx\" " ), x, y, w, h );

    sTmp.Printf( wxT( " <image x=\"%d\" y=\"%d\" width=\"%dpx\" height=\"%dpx\" " ), x, y, w, h );

    s = s + sTmp;

    s = s + sTmp;

    sTmp.Printf( wxT( " xlink:href=\"%s\"> \n" ), sPNG.c_str() );

    sTmp.Printf( wxT( " xlink:href=\"%s\"> \n" ), GetChars( sPNG ) );

    s = s + sTmp + wxT( "<title>Image from wxSVG</title>  </image>" ) + newline;

    s = s + sTmp + wxT( "<title>Image from wxSVG</title>  </image>" ) + newline;





    if( m_OK && bPNG_OK )

    if( m_OK && bPNG_OK )

common/dialog_load_error.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -47,7 +47,7 @@ void DIALOG_LOAD_ERROR::ListSet(const wxString &list) 
void DIALOG_LOAD_ERROR::MessageSet(const wxString &message)

void DIALOG_LOAD_ERROR::MessageSet(const wxString &message)

{

{

	wxString message_value;

	wxString message_value;

    message_value.Printf(wxT("<b>%s</b><br>"), message.GetData() );

    message_value.Printf(wxT("<b>%s</b><br>"), GetChars( message ) );

    m_htmlWindow->AppendToPage( message_value );

    m_htmlWindow->AppendToPage( message_value );

}

}