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/cprint.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'app/bin/cprint.c') diff --git a/app/bin/cprint.c b/app/bin/cprint.c index 123ad99..086fa21 100644 --- a/app/bin/cprint.c +++ b/app/bin/cprint.c @@ -743,7 +743,9 @@ static void DoPrintMargin( void ) if ( customMarginWin == NULL ) { int x=10, y=10; customMarginWin = ParamCreateDialog( &customMarginPG, - MakeWindowTitle(_("Print Margins")), _("Ok"), DoPrintMarginOk, NULL, TRUE, + MakeWindowTitle(_("Print Margins")), + _("Ok"), DoPrintMarginOk, + ParamCancel_Null, TRUE, PrintMarginLayout, F_BLOCK, PrintMarginDlgUpdate ); if ( customMarginWin == NULL ) { return; @@ -1438,7 +1440,8 @@ static STATUS_T CmdPrint( } print_d.scale = printScale; printWin = ParamCreateDialog( &printPG, MakeWindowTitle(_("Print")), _("Print"), - DoPrintPrint, (paramActionCancelProc)Reset, TRUE, NULL, 0, PrintDlgUpdate ); + DoPrintPrint, ParamCancel_Reset, + TRUE, NULL, 0, PrintDlgUpdate ); } sPrinterName = wPrintGetName(); while ( *sPrinterName == '\0' ) { @@ -1560,7 +1563,7 @@ static STATUS_T CmdPrint( } -#include "bitmaps/doc-print.xpm3" +#include "bitmaps/doc-print.image3" EXPORT wIndex_t InitCmdPrint( wMenu_p menu ) { @@ -1572,7 +1575,7 @@ EXPORT wIndex_t InitCmdPrint( wMenu_p menu ) AddRotateMenu( printGridPopupM, PrintGridRotate ); ParamRegister( &customMarginPG ); return AddMenuButton( menu, CmdPrint, "cmdPrint", N_("Print..."), - wIconCreatePixMap(doc_print_xpm3[iconSize]), LEVEL0, + wIconCreatePixMap(doc_print_image3[iconSize]), LEVEL0, IC_LCLICK|IC_POPUP3|IC_CMDMENU, ACCL_PRINT, NULL ); } -- cgit v1.2.3