haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
raburton 2007-06-05 17:43:34 +00:00
parent a70e9ada3e
commit cf460a052a
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/fctsys.h
View File

@ -51,7 +51,6 @@
#define wxFD_OVERWRITE_PROMPT wxOVERWRITE_PROMPT #define wxFD_OVERWRITE_PROMPT wxOVERWRITE_PROMPT
#define WXK_PAGEUP WXK_PRIOR #define WXK_PAGEUP WXK_PRIOR
#define WXK_PAGEDOWN WXK_NEXT #define WXK_PAGEDOWN WXK_NEXT
#define wxRenameFile(a, b, c) wxRenameFile(a, b)
#endif #endif
#ifdef __UNIX__ #ifdef __UNIX__

8
kicad/treeprj_datas.cpp
View File

@ -177,7 +177,11 @@ void TreePrjItemData::Move( TreePrjItemData * dest )
if ( destName == GetFileName() ) return; // Same place ?? if ( destName == GetFileName() ) return; // Same place ??
// Move the file on the disk: // 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 ) ) if ( !wxRenameFile( GetFileName(), destName, false ) )
#endif
{ {
wxMessageDialog( m_Parent, _( "Unable to move file ... "), _( "Permission error ?" ), wxICON_ERROR | wxOK ); wxMessageDialog( m_Parent, _( "Unable to move file ... "), _( "Permission error ?" ), wxICON_ERROR | wxOK );
return; return;
@ -244,7 +248,11 @@ bool TreePrjItemData::Rename( const wxString & name, bool check )
if ( wxID_YES != dialog.ShowModal() ) return false; 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 ) ) if (! wxRenameFile( m_FileName, newFile, false ) )
#endif
{ {
wxMessageDialog( m_Parent, _( "Unable to rename file ... "), _( "Permission error ?" ), wxICON_ERROR | wxOK ); wxMessageDialog( m_Parent, _( "Unable to rename file ... "), _( "Permission error ?" ), wxICON_ERROR | wxOK );
return false; return false;