Merge tag 'upstream/4.3.0'

Upstream version 4.3.0

1 files changed, 26 insertions, 2 deletions

diff --git a/app/bin/misc.h b/app/bin/misc.h
index 7d3231e..1747189 100644
--- a/app/bin/misc.h
+++ b/app/bin/misc.h
@@ -318,6 +318,7 @@ addButtonCallBack_t OutputBitMapInit( void );
 addButtonCallBack_t CustomMgrInit( void );
 addButtonCallBack_t PriceListInit( void );
 addButtonCallBack_t ParamFilesInit( void );
+addButtonCallBack_t ControlMgrInit ( void );
 
 wIndex_t InitGrid( wMenu_p menu );
 
@@ -373,6 +374,18 @@ void CarCustMgmLoad();
 BOOL_T CompoundCustomSave(FILE*);
 BOOL_T CarCustomSave(FILE*);
 
+/* dcontmgm.c */
+#define CONTMGM_CAN_EDIT                (1)
+#define CONTMGM_DO_EDIT                 (2)
+#define CONTMGM_CAN_DELETE              (3)
+#define CONTMGM_DO_DELETE               (4)
+#define CONTMGM_GET_TITLE               (5)
+#define CONTMGM_DO_HILIGHT              (6)
+#define CONTMGM_UN_HILIGHT              (7)
+
+typedef int (*contMgmCallBack_p) (int, void *);
+void ContMgmLoad (wIcon_p,contMgmCallBack_p,void *);
+
 /* doption.c */
 long GetDistanceFormat( void );
 
@@ -382,10 +395,21 @@ void ClearCars( void );
 void CarDlgAddProto( void );
 void CarDlgAddDesc( void );
 void AttachTrains( void );
-#endif
+
 
 /* cblock.c */
 void InitCmdBlock( wMenu_p menu );
-
+void BlockMgmLoad( void );
 /* cswitchmotor.c */
 void InitCmdSwitchMotor( wMenu_p menu );
+void SwitchmotorMgmLoad( void );
+/* csignal.c */
+void InitCmdSignal ( wMenu_p menu );
+void SignalMgmLoad ( void );
+/* ccontrol.c */
+void ControlMgmLoad ( void );
+void InitCmdControl ( wMenu_p menu );
+/* csensor.c */
+void SensorMgmLoad ( void );
+void InitCmdSensor ( wMenu_p menu );
+#endif