kicad-developers team mailing list archive

[Dick Hollenbeck <dick@...>]

Denis,

Your patch would be easier to process if you:

a) checked out the current files which the patch touches

b) enhanced those so that your changes are conditional on wx version

similar to line 165 of tool_pcb.c

#if wxCHECK_VERSION(2,8,3)

Then do a diff to create the patch from that modified version.

That is what we'd have to do. You'd be saving us this work, and 
therefore lowering the barrier to adding your patch.

Thanks.


> While we're talking about wx-2.6 compatibility, here's a small patch
> (in attachment) that is required in Gentoo to compile against it. I'd
> be surprised if it was specific to Gentoo only, though. It should only
> be applied when wx-2.6 headers and libs are used, thus a wx version
> check is required if you include it in the code (in Gentoo it's done
> in the installation script).
>
> Denis.
>
>
>
> Yahoo! Groups Links
>
>
>
>
> ------------------------------------------------------------------------
>
> diff -Nadur kicad-20070525.orig/kicad/treeprj_datas.cpp kicad-20070525.wx26/kicad/treeprj_datas.cpp
> --- kicad-20070525.orig/kicad/treeprj_datas.cpp	2007-05-14 09:05:24.000000000 +0200
> +++ kicad-20070525.wx26/kicad/treeprj_datas.cpp	2007-06-15 19:33:34.000000000 +0200
> @@ -177,7 +177,7 @@
> if ( destName == GetFileName() ) return; // Same place ??
>
> // Move the file on the disk:
> -	if ( !wxRenameFile( GetFileName(), destName, false ) )
> +	if ( !wxRenameFile( GetFileName(), destName ) )
> {
> wxMessageDialog( m_Parent, _( "Unable to move file ... "), _( "Permission error ?" ), wxICON_ERROR | wxOK );
> return;
> @@ -244,7 +244,7 @@
> if ( wxID_YES != dialog.ShowModal() ) return false;
> }
>
> -	if (! wxRenameFile( m_FileName, newFile, false ) )
> +	if (! wxRenameFile( m_FileName, newFile ) )
> {
> wxMessageDialog( m_Parent, _( "Unable to rename file ... "), _( "Permission error ?" ), wxICON_ERROR | wxOK );
> return false;
> diff -Nadur kicad-20070525.orig/kicad/treeprj_frame.cpp kicad-20070525.wx26/kicad/treeprj_frame.cpp
> --- kicad-20070525.orig/kicad/treeprj_frame.cpp	2007-05-25 09:00:02.000000000 +0200
> +++ kicad-20070525.wx26/kicad/treeprj_frame.cpp	2007-06-15 19:33:34.000000000 +0200
> @@ -363,7 +363,7 @@
> mask,	/* extension par defaut */
> mask,	/* Masque d'affichage */
> this,
> -	wxFD_SAVE | wxFD_OVERWRITE_PROMPT,
> +	wxFD_SAVE | wxOVERWRITE_PROMPT,
> TRUE
> );
> if ( filename.IsEmpty() ) return;


--
Best Regards,

Dick

*** If he runs, I will be supporting Tom Tancredo for President in 2008. ***
http://tancredo.house.gov/
http://www.teamtancredo.com/
http://tancredo4prez.blogspot.com/