Commit cf460a05 authored by raburton's avatar raburton
Browse files

fix my wx2.6 compatibility fix, found a problem after doing a full rebuild

parent a70e9ada

include/fctsys.h

+0 −1
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ 
#define wxFD_OVERWRITE_PROMPT wxOVERWRITE_PROMPT

#define WXK_PAGEUP WXK_PRIOR

#define WXK_PAGEDOWN WXK_NEXT

#define wxRenameFile(a, b, c) wxRenameFile(a, b)

#endif



#ifdef __UNIX__

kicad/treeprj_datas.cpp

+8 −0
Original line number Diff line number Diff line
@@ -177,7 +177,11 @@ void TreePrjItemData::Move( TreePrjItemData * dest ) 
	if ( destName == GetFileName() ) return; // Same place ??



	// Move the file on the disk:

#if ( (wxMAJOR_VERSION < 2) || ((wxMAJOR_VERSION == 2)&& (wxMINOR_VERSION < 7)) )

	if ( !wxRenameFile( GetFileName(), destName ) )

#else

	if ( !wxRenameFile( GetFileName(), destName, false ) )

#endif

	{

		wxMessageDialog( m_Parent, _( "Unable to move file ... "), _( "Permission error ?" ), wxICON_ERROR | wxOK );

		return;
@@ -244,7 +248,11 @@ bool TreePrjItemData::Rename( const wxString & name, bool check ) 
		if ( wxID_YES != dialog.ShowModal() ) return false;

	}



#if ( (wxMAJOR_VERSION < 2) || ((wxMAJOR_VERSION == 2)&& (wxMINOR_VERSION < 7)) )

	if (! wxRenameFile( m_FileName, newFile ) )

#else

	if (! wxRenameFile( m_FileName, newFile, false ) )

#endif

	{

		wxMessageDialog( m_Parent, _( "Unable to rename file ... "), _( "Permission error ?" ), wxICON_ERROR | wxOK );

		return false;