From e7d20cf352688bf717a01f4e6d9e6f497c2bea4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 20 Sep 2025 19:19:34 +0200 Subject: New upstream version 5.3.1Beta2 --- app/bin/cturnout.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'app/bin/cturnout.c') diff --git a/app/bin/cturnout.c b/app/bin/cturnout.c index 9bae6ae..96f4f93 100644 --- a/app/bin/cturnout.c +++ b/app/bin/cturnout.c @@ -2117,7 +2117,6 @@ static void TurnoutDlgUpdate( AddTurnout(); curTurnout = to; RedrawTurnout( turnoutD.d, NULL, 0, 0 ); - /* ParamDialogOkActive( &turnoutPG, FALSE ); */ } @@ -2958,13 +2957,11 @@ static STATUS_T CmdTurnout( case C_START: if (turnoutW == NULL) { - /* turnoutW = ParamCreateDialog( &turnoutPG, MakeWindowTitle("Fixed-Track"), "Ok", , (paramActionCancelProc)Reset, TRUE, NULL, F_RESIZE|F_RECALLSIZE, TurnoutDlgUpdate ); */ turnoutW = ParamCreateDialog(&turnoutPG, MakeWindowTitle(_("Add Fixed-Track")), - _("Close"), (paramActionOkProc)TurnoutOk, wHide, TRUE, NULL, + _("Close"), (paramActionOkProc)TurnoutOk, ParamCancel_Null, TRUE, NULL, F_RESIZE | F_RECALLSIZE | PD_F_ALT_CANCELLABEL, TurnoutDlgUpdate); InitNewTurn(turnoutNewM); } - /* ParamDialogOkActive( &turnoutPG, FALSE ); */ turnoutIndex = wListGetIndex(turnoutListL); turnoutPtr = curTurnout; wShow(turnoutW); @@ -3182,13 +3179,13 @@ static STATUS_T CmdTurnoutHotBar( } #ifdef TURNOUTCMD -#include "bitmaps/turnout.xpm3" +#include "bitmaps/turnout.image3" EXPORT void InitCmdTurnout(wMenu_p menu) { AddMenuButton(menu, CmdTurnout, "cmdNewFixedTrack", _("Fixed-Track"), - wIconCreatePixMap(turnout_xpm3[iconSize]), LEVEL0_50, + wIconCreatePixMap(turnout_image3[iconSize]), LEVEL0_50, IC_WANT_MOVE | IC_STICKY | IC_LCLICK | IC_CMDMENU | IC_POPUP2, ACCL_TURNOUT, NULL); turnoutHotBarCmdInx = AddMenuButton(menu, CmdTurnoutHotBar, "cmdTurnoutHotBar", -- cgit v1.2.3