diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2025-09-20 19:20:03 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2025-09-20 19:20:03 +0200 |
| commit | b45d74b60dfb7e23911df6b0523890e42f711267 (patch) | |
| tree | 42bb5764b05bd3bc5bffadb55f4375e6dce8a521 /app/bin/cturnout.c | |
| parent | 6c1a798b0302034a7fdcaf93b8f014e2e458c2a0 (diff) | |
| parent | 63ec5715054be18ac4db5675e067b41c955d03b9 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'app/bin/cturnout.c')
| -rw-r--r-- | app/bin/cturnout.c | 9 |
1 files changed, 3 insertions, 6 deletions
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", |