From 989ccd0e0e6c1eb1eaabb74cd772a1d71981565b Mon Sep 17 00:00:00 2001 From: charras Date: Thu, 16 Apr 2009 15:50:55 +0000 Subject: [PATCH] wxWidgets 2.9 compatibility change. --- COMPILING-Debian.txt | 4 ++-- pcbnew/specctra.cpp | 22 +++++++++++++++++----- running_kicad_under_W98.txt | 10 ---------- 3 files changed, 19 insertions(+), 17 deletions(-) delete mode 100644 running_kicad_under_W98.txt diff --git a/COMPILING-Debian.txt b/COMPILING-Debian.txt index 4b853c4879..a6b1823739 100644 --- a/COMPILING-Debian.txt +++ b/COMPILING-Debian.txt @@ -33,8 +33,8 @@ Checkout sourcecode using subversion or download latest release. 'svn checkout https://kicad.svn.sourceforge.net/svnroot/kicad/trunk/kicad kicad' *Release* -'wget ftp://iut-tice.ujf-grenoble.fr/cao/kicad-sources-2008-08-25c.tar.gz' -'tar -xvf kicad-sources-2008-08-25c.tar.gz' +download http://iut-tice.ujf-grenoble.fr/cao/kicad-sources-yyyy-mm-dd.tgz' +'tar -xvf kicad-sources-yyyy-mm-dd.tgz' Compiling diff --git a/pcbnew/specctra.cpp b/pcbnew/specctra.cpp index b9cc015564..7d2f1f729d 100644 --- a/pcbnew/specctra.cpp +++ b/pcbnew/specctra.cpp @@ -321,7 +321,9 @@ void SPECCTRA_DB::LoadPCB( const wxString& filename ) throw( IOError ) if( !fp ) { - ThrowIOError( _("Unable to open file \"") + filename +wxT("\"") ); + wxString msg; + msg.Printf( _("Unable to open file \"%s\""), filename.GetData() ); + ThrowIOError( msg ); } file.Attach( fp ); // "exception safe" way to close the file. @@ -351,7 +353,9 @@ void SPECCTRA_DB::LoadSESSION( const wxString& filename ) throw( IOError ) if( !fp ) { - ThrowIOError( _("Unable to open file \"") + filename + wxT("\"") ); + wxString msg; + msg.Printf( _("Unable to open file \"%s\""), filename.GetData() ); + ThrowIOError( msg ); } file.Attach( fp ); // "exception safe" way to close the file. @@ -3465,7 +3469,11 @@ int SPECCTRA_DB::Print( int nestLevel, const char* fmt, ... ) throw( IOError ) } if( result<0 || (result=vfprintf( fp, fmt, args ))<0 ) - ThrowIOError( _("System file error writing to file \"") + filename + wxT("\"") ); + { + wxString msg; + msg.Printf( _("System file error writing to file \"%s\""), filename.GetData() ); + ThrowIOError( msg ); + } va_end( args ); @@ -3521,7 +3529,9 @@ void SPECCTRA_DB::ExportPCB( wxString filename, bool aNameChange ) throw( IOErro if( !fp ) { - ThrowIOError( _("Unable to open file \"") + filename + wxT("\"") ); + wxString msg; + msg.Printf( _("Unable to open file \"%s\""), filename.GetData() ); + ThrowIOError( msg ); } if( pcb ) @@ -3546,7 +3556,9 @@ void SPECCTRA_DB::ExportSESSION( wxString filename ) if( !fp ) { - ThrowIOError( _("Unable to open file \"") + filename + wxT("\"") ); + wxString msg; + msg.Printf( _("Unable to open file \"%s\""), filename.GetData() ); + ThrowIOError( msg ); } if( session ) diff --git a/running_kicad_under_W98.txt b/running_kicad_under_W98.txt deleted file mode 100644 index a10ffdae31..0000000000 --- a/running_kicad_under_W98.txt +++ /dev/null @@ -1,10 +0,0 @@ -Since the 2007-05-25 version, Kicad (which uses unicode strings) can run under W98, -if the library unicows.dll is found by kicad. - -If you want to use kicad you must download unicows.dll, -and copy it in Windows or kicad/winexe directory. -Because many others programs use unicows.dll, this can be already done. - -But kicad is NOT tested under W98. -A known problem is incorrect printing -(However, you can plot a postscript file, and use gsview to show and print it)