New upstream version 5.3.1Beta2upstream/5.3.1Beta2

1 files changed, 41 insertions, 3 deletions

diff --git a/app/bin/param.h b/app/bin/param.h
index 004dcb5..3705161 100644
--- a/app/bin/param.h
+++ b/app/bin/param.h
@@ -227,8 +227,6 @@ extern long angleSystem;
 #define DISTFMT_FRACT_NUM		0x0000
 #define DISTFMT_FRACT_FRC		0x0400
 
-FLOAT_T DecodeFloat( wString_p, BOOL_T * );
-FLOAT_T DecodeDistance( wString_p, BOOL_T * );
 char * FormatLong( long );
 char * FormatFloat( FLOAT_T );
 char * FormatDistance( FLOAT_T );
@@ -245,9 +243,14 @@ long ParamUpdate( paramGroup_p );
 void ParamRegister( paramGroup_p );
 void ParamGroupRecord( paramGroup_p );
 void ParamUpdatePrefs( void );
-void ParamStartRecord( void );
+void ParamStartRecord( FILE *recordF );
 void ParamRestoreAll( void );
 void ParamSaveAll( void );
+void ParamSetInReadTracks(bool state);
+void ParamSetInPlayback(bool state, long delay);
+void ParamTurnOffDelays(bool disable);
+
+
 
 void ParamMenuPush( void * );
 void ParamHilite( wWin_p, wControl_p, BOOL_T );
@@ -269,6 +272,41 @@ long GetChanges(paramGroup_p pg);
 		if ( HS ) GetBalloonHelpStr(HS);
 
 #define PD_F_ALT_CANCELLABEL	(1L<<30)		/**<use Close or Cancel for the discard button */
+
+// How dialogs handle Cancel:
+//
+// Remove Cancel button from dialogs that affect on-layout objects
+#define PARAMCANCEL_NEWUNDO
+
+// Cancel button not needed: map, demo, print margin,
+extern void *ParamCancel_Null;
+
+// These affect objects on the layout
+// No Cancel button, use Undo to revert: describe, profile, move, rotate
+// undefine PARAMCANCEL_NEWUNDO to re-enable Cancel button
+#ifdef PARAMCANCEL_NEWUNDO
+extern void *ParamCancel_Undo;
+#else
+void ParamCancel_Undo( wWin_p );
+#endif
+
+// Cancel leaves values in current state
+// Most dialogs
+void ParamCancel_Current( wWin_p );
+
+// As above and exits command regardless of Sticky
+// print, snap, *noteui
+void ParamCancel_Reset( wWin_p );
+
+// Cancel restores values to previous state
+// Done/Ok propagates changed values. Cancel just closes dialog
+void ParamCancel_Restore( wWin_p );
+
+// Pending
+// Dialogs which haven't been converted yet: work in progress
+// signalEdit, carDlg, layout, paramfilesearch_ui
+#define ParamCancel_Custom( PROC ) PROC
+
 wWin_p ParamCreateDialog( paramGroup_p, char *, char *, paramActionOkProc,
                           paramActionCancelProc, BOOL_T, paramLayoutProc, long, paramChangeProc );
 void ParamCreateControls( paramGroup_p, paramChangeProc );