New upstream version 5.3.0GAupstream/5.3.0GAupstream

1 files changed, 14 insertions, 9 deletions

diff --git a/app/bin/fileio.h b/app/bin/fileio.h
index a037063..0ea80af 100644
--- a/app/bin/fileio.h
+++ b/app/bin/fileio.h
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifndef FILEIO_H
@@ -42,6 +42,9 @@ extern const char * libDir;
 extern wBool_t bReadOnly;
 extern wBool_t bExample;
 
+// Processing an input file, objects may be incomplete so avoid some ops (MapRedraw)
+extern wBool_t bInReadTracks;
+
 #define PARAM_CUSTOM	(-2)
 #define PARAM_LAYOUT	(-3)
 extern int curParamFileIndex;
@@ -56,8 +59,6 @@ extern wBool_t inPlaybackQuit;
 extern wWin_p demoW;
 extern int curDemo;
 
-extern wMenuList_p fileList_ml;
-
 #define ZIPFILETYPEEXTENSION "xtce"
 
 #define PARAM_SUBDIR "params"
@@ -96,7 +97,7 @@ BOOL_T GetArgs( char *, char *, ... );
 char * ReadMultilineText();
 BOOL_T ParseRoomSize( char *, coOrd * );
 int InputError( char *, BOOL_T, ... );
-void SyntaxError( char *, wIndex_t, wIndex_t ); 
+void SyntaxError( char *, wIndex_t, wIndex_t );
 
 void AddParam( char *name, readParam_t proc );
 
@@ -110,21 +111,23 @@ void DoParamFiles(void * unused);
 
 int LoadTracks( int cnt, char **fileName, void *data );
 
-typedef void (*doSaveCallBack_p)( void );
-void SetAutoSave(void);
+void SaveState( void );
 void DoSave( void * doAfterSaveVP );
 void DoSaveAs( void * doAfterSaveVP );
 void DoLoad( void );
 void DoExamples( void );
 void DoFileList( int, char *, void * );
-void DoCheckPoint( void );
-void CleanupFiles( void );
+void TryCheckPoint( void );
+void CleanupCheckpointFiles( void );
+void CleanupTempArchive( void );
 int ExistsCheckpoint( void );
 int LoadCheckpoint( BOOL_T );
 void DoImport( void * typeVP );
 void DoExport( void * unused );
 void DoExportDXF( void * unused );
-void DoExportSVG(void);
+#if XTRKCAD_CREATE_SVG
+void DoExportSVG( void * unused );
+#endif
 extern wBool_t editStatus; // Status of last Edit* command
 void EditCopy( void * unused );
 void EditCut( void * unused );
@@ -143,10 +146,12 @@ int RegLevel( void );
 void ReadKey( void );
 void PopupRegister( void * );
 
+void LoadFileList( void );
 void FileInit( void );
 
 BOOL_T MacroInit( void );
 
+int Copyfile( const char * fn1, const char * fn2);
 void SetCLocale();
 void SetUserLocale();