diff options
Diffstat (limited to 'app/bin/misc.h')
| -rw-r--r-- | app/bin/misc.h | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/app/bin/misc.h b/app/bin/misc.h index 1747189..2a26b0c 100644 --- a/app/bin/misc.h +++ b/app/bin/misc.h @@ -25,12 +25,15 @@ #define EXPORT +#include <stdio.h> + #include "acclkeys.h" +#include "common.h" +#include "draw.h" +#include "wlib.h" typedef void (*addButtonCallBack_t)(void*); -#include "custom.h" - #ifdef WINDOWS /* suppress warning from *.bmp about conversion of int to char */ #pragma warning( disable : 4305) @@ -72,8 +75,7 @@ extern DIST_T connectDistance; extern ANGLE_T connectAngle; extern long twoRailScale; extern long mapScale; -extern char Title1[40]; -extern char Title2[40]; +extern long zoomCorner; extern long checkPtInterval; extern long liveMap; extern long preSelect; @@ -84,9 +86,6 @@ extern long descriptionFontSize; extern long units; extern long onStartup; extern long angleSystem; -extern SCALEINX_T curScaleInx; -extern GAUGEINX_T curGaugeInx; -extern SCALEDESCINX_T curScaleDescInx; extern DIST_T trackGauge; extern DIST_T curScaleRatio; extern char * curScaleName; @@ -181,7 +180,7 @@ extern wPos_t DlgSepFrmBottom; extern wWin_p mainW; extern wPos_t toolbarHeight; extern wIndex_t changed; -extern char FAR message[STR_LONG_SIZE]; +extern char message[STR_LONG_SIZE]; extern REGION_T curRegion; extern long paramVersion; extern coOrd zero; @@ -199,8 +198,11 @@ extern wMenu_p popup1M, popup2M; #define wControlBeside( B ) (wControlGetPosX((wControl_p)(B))+wControlGetWidth((wControl_p)(B))) typedef void (*rotateDialogCallBack_t) ( void * ); +typedef void (*moveDialogCallBack_t) (void *); extern void AddRotateMenu( wMenu_p, rotateDialogCallBack_t ); +extern void AddMoveMenu( wMenu_p, moveDialogCallBack_t ); extern void StartRotateDialog( rotateDialogCallBack_t ); +extern void StartMoveDialog(moveDialogCallBack_t ); /* * Safe Memory etc */ @@ -219,6 +221,9 @@ int NoticeMessage( char *, char*, char *, ... ); int NoticeMessage2( int, char *, char*, char *, ... ); void DoQuit( void ); +char * ConvertFromEscapedText(const char * text); +char * ConvertToEscapedText(const char * text); + void wShow( wWin_p ); void wHide( wWin_p ); void CloseDemoWindows( void ); @@ -282,10 +287,6 @@ typedef void (*changeNotificationCallBack_t)( long ); void RegisterChangeNotification( changeNotificationCallBack_t ); void DoChangeNotification( long ); -#include "param.h" -#include "misc2.h" -#include "fileio.h" - /* foreign externs */ extern drawCmd_t mapD; extern STATUS_T CmdEnumerate( wAction_t, coOrd ); @@ -386,6 +387,11 @@ BOOL_T CarCustomSave(FILE*); typedef int (*contMgmCallBack_p) (int, void *); void ContMgmLoad (wIcon_p,contMgmCallBack_p,void *); +/* dlayer.c */ +void LayerSetCounts(); +void DecrementLayerObjects(unsigned int index); +void IncrementLayerObjects(unsigned int index); + /* doption.c */ long GetDistanceFormat( void ); |