fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2011-01-10 20:02 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/src/rtl/gtgui/gtgui.c
    + added basic support for redirecting ALERT() to MessageBox() in
      MS-Windows GTGUI builds. Please remember that MessageBox() supports
      only few predefined buttons so it's not possible to show all user
      options. Anyhow it should be enough to present error messages
      generated by default error handler.
This commit is contained in:
Przemyslaw Czerpak
2011-01-10 19:03:02 +00:00
parent cd02f3399a
commit 13b7273d44
2 changed files with 175 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
harbour/ChangeLog
View File

@@ -16,6 +16,14 @@
The license applies to all entries newer than 2009-04-28.
*/
2011-01-10 20:02 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/src/rtl/gtgui/gtgui.c
+ added basic support for redirecting ALERT() to MessageBox() in
MS-Windows GTGUI builds. Please remember that MessageBox() supports
only few predefined buttons so it's not possible to show all user
options. Anyhow it should be enough to present error messages
generated by default error handler.
2011-01-10 19:59 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbformat/utils/hbformat.prg
% Minor optimizations.

167
harbour/src/rtl/gtgui/gtgui.c
View File

@@ -62,6 +62,7 @@
#if defined( HB_OS_WIN )
#include <windows.h>
#include "hbwinuni.h"
#endif
/* *********************************************************************** */
@@ -71,6 +72,169 @@ static HB_GT_FUNCS SuperTable;
#define HB_GTSUPER (&SuperTable)
#define HB_GTID_PTR (&s_GtId)
#if defined( HB_OS_WIN )
typedef struct
{
const char * name;
HB_SIZE len;
int id;
} _HB_BUTTON_ID;
static const _HB_BUTTON_ID s_buttons[] =
{
{ "OK", 2, 0x0001 },
{ "QUIT", 4, 0x0002 },
{ "CANCEL", 6, 0x0002 },
{ "ABORT", 5, 0x0002 },
{ "RETRY", 5, 0x0004 },
{ "AGAIN", 5, 0x0004 },
{ "TRY AGAIN", 9, 0x0004 },
{ "DEFAULT", 7, 0x0008 },
{ "CONTINUE", 8, 0x0008 },
{ "IGNORE", 6, 0x0008 },
{ "YES", 3, 0x0010 },
{ "NO", 2, 0x0020 }
};
#define _HB_BUTTON_COUNT HB_SIZEOFARRAY( s_buttons )
static int hb_gt_gui_optionId( const char * pszOption )
{
if( pszOption )
{
HB_SIZE nSize;
int i;
while( HB_ISSPACE( *pszOption ) )
pszOption++;
nSize = strlen( pszOption );
while( nSize > 0 && HB_ISSPACE( pszOption[ nSize - 1 ] ) )
nSize--;
if( nSize >= 2 && nSize <= 9 )
{
for( i = 0; i < ( int ) _HB_BUTTON_COUNT; ++i )
{
if( nSize == s_buttons[ i ].len &&
hb_strnicmp( s_buttons[ i ].name, pszOption, nSize ) == 0 )
{
return s_buttons[ i ].id;
}
}
}
}
return 0;
}
static int hb_gt_gui_optionPos( int id, int iType, PHB_ITEM pOptions )
{
int iButton = 0;
switch( id )
{
case IDOK:
iButton = 0x0001;
break;
case IDCANCEL:
iButton = 0x0002;
break;
case IDABORT:
iButton = 0x0002;
break;
case IDRETRY:
iButton = 0x0004;
break;
case IDIGNORE:
iButton = 0x0008;
break;
case IDYES:
iButton = 0x0010;
break;
case IDNO:
iButton = 0x0020;
break;
case IDTRYAGAIN:
iButton = 0x0004;
break;
case IDCONTINUE:
iButton = 0x0008;
break;
}
if( iButton )
{
int iOptions = hb_arrayLen( pOptions ), i;
for( i = 1; i <= iOptions; ++i )
{
id = hb_gt_gui_optionId( hb_arrayGetCPtr( pOptions, i ) );
if( iButton == id || ( iOptions == 1 && iType == id ) )
return i;
}
}
return 0;
}
static int hb_gt_gui_Alert( PHB_GT pGT, PHB_ITEM pMessage, PHB_ITEM pOptions,
int iClrNorm, int iClrHigh, double dDelay )
{
void * hText;
LPCTSTR lpText = HB_ITEMGETSTR( pMessage, &hText, NULL );
int iRet = 0, iOptions = pOptions ? ( int ) hb_arrayLen( pOptions ) : 0;
if( lpText && iOptions > 0 )
{
int i, iType = 0;
UINT uType;
for( i = 1; i <= iOptions; ++i )
iType |= hb_gt_gui_optionId( hb_arrayGetCPtr( pOptions, i ) );
switch( iType )
{
case 0x01:
uType = MB_OK;
break;
case 0x03:
uType = MB_OKCANCEL;
break;
case 0x06:
uType = MB_RETRYCANCEL;
break;
case 0x0E:
uType = MB_CANCELTRYCONTINUE;
break;
case 0x12:
uType = MB_OKCANCEL;
break;
case 0x21:
uType = MB_YESNO;
break;
case 0x30:
uType = MB_YESNO;
break;
case 0x32:
uType = MB_YESNOCANCEL;
break;
default:
uType = MB_OK;
break;
}
iRet = MessageBox( NULL, lpText, TEXT( "" ), uType );
iRet = hb_gt_gui_optionPos( iRet, iType, pOptions );
}
else
iRet = HB_GTSUPER_ALERT( pGT, pMessage, pOptions, iClrNorm,
iClrHigh, dDelay );
hb_strfree( hText );
return iRet;
}
#endif /* HB_OS_WIN */
/* *********************************************************************** */
static const char * hb_gt_gui_Version( PHB_GT pGT, int iType )
@@ -149,6 +313,9 @@ static HB_BOOL hb_gt_FuncInit( PHB_GT_FUNCS pFuncTable )
pFuncTable->Version = hb_gt_gui_Version;
pFuncTable->Tone = hb_gt_gui_Tone;
pFuncTable->Info = hb_gt_gui_Info;
#if defined( HB_OS_WIN )
pFuncTable->Alert = hb_gt_gui_Alert;
#endif
return HB_TRUE;
}