diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2025-09-20 19:19:41 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2025-09-20 19:19:41 +0200 |
| commit | 63ec5715054be18ac4db5675e067b41c955d03b9 (patch) | |
| tree | 42bb5764b05bd3bc5bffadb55f4375e6dce8a521 /app/bin/cblock.c | |
| parent | 6c1a798b0302034a7fdcaf93b8f014e2e458c2a0 (diff) | |
| parent | e7d20cf352688bf717a01f4e6d9e6f497c2bea4c (diff) | |
Update upstream source from tag 'upstream/5.3.1Beta2'
Update to upstream version '5.3.1Beta2'
with Debian dir 36e53756d97319b1944d0ea744717abc9326f697
Diffstat (limited to 'app/bin/cblock.c')
| -rw-r--r-- | app/bin/cblock.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/app/bin/cblock.c b/app/bin/cblock.c index bc23e14..741052e 100644 --- a/app/bin/cblock.c +++ b/app/bin/cblock.c @@ -690,7 +690,8 @@ static void NewBlockDialog() if ( !blockW ) { ParamRegister( &blockPG ); blockW = ParamCreateDialog (&blockPG, MakeWindowTitle(_("Create Block")), - _("Ok"), BlockOk, wHide, TRUE, NULL, F_BLOCK, NULL ); + _("Ok"), BlockOk, ParamCancel_Current, + TRUE, NULL, F_BLOCK, NULL ); blockD.dpi = mainD.dpi; } ParamLoadControls( &blockPG ); @@ -862,7 +863,7 @@ static void EditBlock (track_p trk) blockEditW = ParamCreateDialog (&blockEditPG, MakeWindowTitle(_("Edit block")), _("Ok"), BlockEditOk, - wHide, TRUE, NULL, F_BLOCK, + ParamCancel_Current, TRUE, NULL, F_BLOCK, NULL ); } ParamLoadControls( &blockEditPG ); @@ -999,10 +1000,7 @@ static int BlockMgmProc ( int cmd, void * data ) } -//#include "bitmaps/blocknew.xpm" -//#include "bitmaps/blockedit.xpm" -//#include "bitmaps/blockdel.xpm" -#include "bitmaps/block.xpm3" +#include "bitmaps/block.image3" EXPORT void BlockMgmLoad( void ) { @@ -1010,7 +1008,7 @@ EXPORT void BlockMgmLoad( void ) static wIcon_p blockI = NULL; if ( blockI == NULL) { - blockI = wIconCreatePixMap( block_xpm3[iconSize] ); + blockI = wIconCreatePixMap( block_image3[iconSize] ); } TRK_ITERATE(trk) { @@ -1025,7 +1023,7 @@ EXPORT void InitCmdBlock( wMenu_p menu ) blockName[0] = '\0'; blockScript[0] = '\0'; AddMenuButton( menu, CmdBlockCreate, "cmdBlockCreate", _("Block"), - wIconCreatePixMap( block_xpm3[iconSize] ), LEVEL0_50, + wIconCreatePixMap( block_image3[iconSize] ), LEVEL0_50, IC_STICKY|IC_POPUP2, ACCL_BLOCK1, NULL ); ParamRegister( &blockPG ); } |