Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
kicad-source-mirror
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
kicad-source-mirror
Commits
cf460a05
Commit
cf460a05
authored
Jun 05, 2007
by
raburton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix my wx2.6 compatibility fix, found a problem after doing a full rebuild
parent
a70e9ada
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
fctsys.h
include/fctsys.h
+0
-1
treeprj_datas.cpp
kicad/treeprj_datas.cpp
+8
-0
No files found.
include/fctsys.h
View file @
cf460a05
...
@@ -51,7 +51,6 @@
...
@@ -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__
...
...
kicad/treeprj_datas.cpp
View file @
cf460a05
...
@@ -177,7 +177,11 @@ void TreePrjItemData::Move( TreePrjItemData * dest )
...
@@ -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 )
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment