From eff6876f82e804a5411e14a731879af5df5b59e9 Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Mon, 10 Jan 2011 21:35:54 +0000 Subject: [PATCH] 2011-01-10 22:35 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/src/rtl/gtgui/gtgui.c * use MB_ABORTRETRYIGNORE instead of MB_RETRYCANCEL only when defined by default and program is executed in W2K or newer Windows version --- harbour/ChangeLog | 5 +++++ harbour/src/rtl/gtgui/gtgui.c | 10 +++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 5236a8c65e..81d4ea417d 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,11 @@ The license applies to all entries newer than 2009-04-28. */ +2011-01-10 22:35 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/src/rtl/gtgui/gtgui.c + * use MB_ABORTRETRYIGNORE instead of MB_RETRYCANCEL only when defined + by default and program is executed in W2K or newer Windows version + 2011-01-10 20:27 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbformat/utils/hbformat.prg * contrib/hbformat/hbformat.prg diff --git a/harbour/src/rtl/gtgui/gtgui.c b/harbour/src/rtl/gtgui/gtgui.c index bae8781e64..3834b4c600 100644 --- a/harbour/src/rtl/gtgui/gtgui.c +++ b/harbour/src/rtl/gtgui/gtgui.c @@ -154,12 +154,16 @@ static int hb_gt_gui_optionPos( int id, int iType, PHB_ITEM pOptions ) case IDNO: iButton = 0x0020; break; +#ifdef IDTRYAGAIN case IDTRYAGAIN: iButton = 0x0004; break; +#endif +#ifdef IDCONTINUE case IDCONTINUE: iButton = 0x0008; break; +#endif } if( iButton ) { @@ -202,7 +206,11 @@ static int hb_gt_gui_Alert( PHB_GT pGT, PHB_ITEM pMessage, PHB_ITEM pOptions, uType = MB_RETRYCANCEL; break; case 0x0E: - uType = MB_CANCELTRYCONTINUE; +#ifdef MB_CANCELTRYCONTINUE + uType = hb_iswin2k() ? MB_CANCELTRYCONTINUE : MB_ABORTRETRYIGNORE; +#else + uType = MB_ABORTRETRYIGNORE; +#endif break; case 0x12: uType = MB_OKCANCEL;