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

2009-02-04 21:59 UTC+0100 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* include/hbgtcore.h
  * contrib/gtwvg/gtwvg.c
  * contrib/gtwvg/wvggui.c
  * source/rtl/gtclip.c
  * source/rtl/gttone.c
  * source/rtl/gtkbstat.c
  * source/rtl/gtgui/gtgui.c
  * source/rtl/gtwin/gtwin.c
  * source/rtl/gtwvt/gtwvt.c
    * hb_gt_w32_*() internal functions renamed to hb_gt_winapi_*().
This commit is contained in:
Viktor Szakats
2009-02-04 20:59:47 +00:00
parent c8c4c234d5
commit 56a8e960d4
10 changed files with 76 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
harbour/ChangeLog
View File

@@ -8,6 +8,18 @@
2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2009-02-04 21:59 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* include/hbgtcore.h
* contrib/gtwvg/gtwvg.c
* contrib/gtwvg/wvggui.c
* source/rtl/gtclip.c
* source/rtl/gttone.c
* source/rtl/gtkbstat.c
* source/rtl/gtgui/gtgui.c
* source/rtl/gtwin/gtwin.c
* source/rtl/gtwvt/gtwvt.c
* hb_gt_w32_*() internal functions renamed to hb_gt_winapi_*().
2009-02-04 21:48 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* contrib/rddado/tests/hbmk_b32.bat
* contrib/rddado/tests/hbmk_vc.bat

28
harbour/contrib/gtwvg/gtwvg.c
View File

@@ -1149,10 +1149,10 @@ static void hb_gt_wvt_MouseEvent( PHB_GTWVT pWVT, UINT message, WPARAM wParam, L
if( j > 0 )
{
hb_gt_w32_setClipboard( pWVT->CodePage == OEM_CHARSET ?
CF_OEMTEXT : CF_TEXT,
sBuffer,
j );
hb_gt_winapi_setClipboard( pWVT->CodePage == OEM_CHARSET ?
CF_OEMTEXT : CF_TEXT,
sBuffer,
j );
}
hb_xfree( sBuffer );
@@ -2446,7 +2446,7 @@ static void hb_gt_wvt_Tone( PHB_GT pGT, double dFrequency, double dDuration )
HB_SYMBOL_UNUSED( pGT );
hb_gt_w32_tone( dFrequency, dDuration );
hb_gt_winapi_tone( dFrequency, dDuration );
}
/* ********************************************************************** */
@@ -2781,26 +2781,26 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
break;
case HB_GTI_KBDSHIFTS:
pInfo->pResult = hb_itemPutNI( pInfo->pResult, hb_gt_w32_getKbdState() );
pInfo->pResult = hb_itemPutNI( pInfo->pResult, hb_gt_winapi_getKbdState() );
if( hb_itemType( pInfo->pNewVal ) & HB_IT_NUMERIC )
hb_gt_w32_setKbdState( hb_itemGetNI( pInfo->pNewVal ) );
hb_gt_winapi_setKbdState( hb_itemGetNI( pInfo->pNewVal ) );
break;
case HB_GTI_CLIPBOARDDATA:
if( hb_itemType( pInfo->pNewVal ) & HB_IT_STRING )
{
hb_gt_w32_setClipboard( pWVT->CodePage == OEM_CHARSET ?
CF_OEMTEXT : CF_TEXT,
hb_itemGetCPtr( pInfo->pNewVal ),
hb_itemGetCLen( pInfo->pNewVal ) );
hb_gt_winapi_setClipboard( pWVT->CodePage == OEM_CHARSET ?
CF_OEMTEXT : CF_TEXT,
hb_itemGetCPtr( pInfo->pNewVal ),
hb_itemGetCLen( pInfo->pNewVal ) );
}
else
{
char * szClipboardData;
ULONG ulLen;
if( hb_gt_w32_getClipboard( pWVT->CodePage == OEM_CHARSET ?
CF_OEMTEXT : CF_TEXT,
&szClipboardData, &ulLen ) )
if( hb_gt_winapi_getClipboard( pWVT->CodePage == OEM_CHARSET ?
CF_OEMTEXT : CF_TEXT,
&szClipboardData, &ulLen ) )
{
pInfo->pResult = hb_itemPutCLPtr( pInfo->pResult,
szClipboardData,

22
harbour/contrib/gtwvg/wvggui.c
View File

@@ -1381,7 +1381,7 @@ static void hb_gt_wvt_Tone( PHB_GT pGT, double dFrequency, double dDuration )
HB_SYMBOL_UNUSED( pGT );
hb_gt_w32_tone( dFrequency, dDuration );
hb_gt_winapi_tone( dFrequency, dDuration );
}
/* ********************************************************************** */
@@ -1681,27 +1681,27 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
}
case HB_GTI_KBDSHIFTS:
{
pInfo->pResult = hb_itemPutNI( pInfo->pResult, hb_gt_w32_getKbdState() );
pInfo->pResult = hb_itemPutNI( pInfo->pResult, hb_gt_winapi_getKbdState() );
if( hb_itemType( pInfo->pNewVal ) & HB_IT_NUMERIC )
hb_gt_w32_setKbdState( hb_itemGetNI( pInfo->pNewVal ) );
hb_gt_winapi_setKbdState( hb_itemGetNI( pInfo->pNewVal ) );
break;
}
case HB_GTI_CLIPBOARDDATA:
{
if( hb_itemType( pInfo->pNewVal ) & HB_IT_STRING )
{
hb_gt_w32_setClipboard( pWVT->CodePage == OEM_CHARSET ?
CF_OEMTEXT : CF_TEXT,
hb_itemGetCPtr( pInfo->pNewVal ),
hb_itemGetCLen( pInfo->pNewVal ) );
hb_gt_winapi_setClipboard( pWVT->CodePage == OEM_CHARSET ?
CF_OEMTEXT : CF_TEXT,
hb_itemGetCPtr( pInfo->pNewVal ),
hb_itemGetCLen( pInfo->pNewVal ) );
}
else
{
char * szClipboardData;
ULONG ulLen;
if( hb_gt_w32_getClipboard( pWVT->CodePage == OEM_CHARSET ?
CF_OEMTEXT : CF_TEXT,
&szClipboardData, &ulLen ) )
if( hb_gt_winapi_getClipboard( pWVT->CodePage == OEM_CHARSET ?
CF_OEMTEXT : CF_TEXT,
&szClipboardData, &ulLen ) )
{
pInfo->pResult = hb_itemPutCLPtr( pInfo->pResult,
szClipboardData,
@@ -2213,5 +2213,3 @@ HB_CALL_ON_STARTUP_END( _hb_startup_gt_Init_ )
static HB_$INITSYM hb_vm_auto__hb_startup_gt_Init_ = _hb_startup_gt_Init_;
#pragma data_seg()
#endif

10
harbour/include/hbgtcore.h
View File

@@ -594,11 +594,11 @@ extern int hb_gt_chrmapinit( int *piTransTbl, const char *pszTerm, BOOL fSetACS
extern BOOL hb_gt_setClipboard( const char * szClipData, ULONG ulLen );
extern BOOL hb_gt_getClipboard( char ** pszClipData, ULONG *pulLen );
#if defined( HB_OS_WIN )
extern BOOL hb_gt_w32_setClipboard( UINT uFormat, const char * szClipData, ULONG ulLen );
extern BOOL hb_gt_w32_getClipboard( UINT uFormat, char ** pszClipData, ULONG *pulLen );
extern int hb_gt_w32_getKbdState( void );
extern void hb_gt_w32_setKbdState( int kbdShifts );
extern void hb_gt_w32_tone( double dFrequency, double dDuration );
extern BOOL hb_gt_winapi_setClipboard( UINT uFormat, const char * szClipData, ULONG ulLen );
extern BOOL hb_gt_winapi_getClipboard( UINT uFormat, char ** pszClipData, ULONG *pulLen );
extern int hb_gt_winapi_getKbdState( void );
extern void hb_gt_winapi_setKbdState( int kbdShifts );
extern void hb_gt_winapi_tone( double dFrequency, double dDuration );
#endif /* HB_OS_WIN */
#if defined( HB_OS_DOS ) || defined( HB_OS_WIN ) || defined( HB_OS_OS2 )
extern int hb_gt_dos_keyCodeTranslate( int iKey );

4
harbour/source/rtl/gtclip.c
View File

@@ -110,7 +110,7 @@ BOOL hb_gt_getClipboard( char ** pszClipData, ULONG *pulLen )
#if defined( HB_OS_WIN )
BOOL hb_gt_w32_setClipboard( UINT uFormat, const char * szClipData, ULONG ulLen )
BOOL hb_gt_winapi_setClipboard( UINT uFormat, const char * szClipData, ULONG ulLen )
{
BOOL fResult = FALSE;
@@ -149,7 +149,7 @@ BOOL hb_gt_w32_setClipboard( UINT uFormat, const char * szClipData, ULONG ulLen
return fResult;
}
BOOL hb_gt_w32_getClipboard( UINT uFormat, char ** pszClipData, ULONG *pulLen )
BOOL hb_gt_winapi_getClipboard( UINT uFormat, char ** pszClipData, ULONG *pulLen )
{
*pulLen = 0;
*pszClipData = NULL;

15
harbour/source/rtl/gtgui/gtgui.c
View File

@@ -90,7 +90,7 @@ static void hb_gt_gui_Tone( PHB_GT pGT, double dFrequency, double dDuration )
#if defined( HB_OS_WIN )
HB_SYMBOL_UNUSED( pGT );
hb_gt_w32_tone( dFrequency, dDuration );
hb_gt_winapi_tone( dFrequency, dDuration );
#else
HB_GTSUPER_TONE( pGT, dFrequency, dDuration );
#endif
@@ -108,18 +108,19 @@ static BOOL hb_gt_gui_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
case HB_GTI_CLIPBOARDDATA:
if( hb_itemType( pInfo->pNewVal ) & HB_IT_STRING )
{
hb_gt_w32_setClipboard( CF_TEXT, hb_itemGetCPtr( pInfo->pNewVal ),
hb_itemGetCLen( pInfo->pNewVal ) );
hb_gt_winapi_setClipboard( CF_TEXT,
hb_itemGetCPtr( pInfo->pNewVal ),
hb_itemGetCLen( pInfo->pNewVal ) );
}
else
{
char * szClipboardData;
ULONG ulLen;
if( hb_gt_w32_getClipboard( CF_TEXT, &szClipboardData, &ulLen ) )
if( hb_gt_winapi_getClipboard( CF_TEXT, &szClipboardData, &ulLen ) )
{
pInfo->pResult = hb_itemPutCLPtr( pInfo->pResult,
szClipboardData, ulLen );
szClipboardData, ulLen );
}
else
{
@@ -129,9 +130,9 @@ static BOOL hb_gt_gui_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
break;
case HB_GTI_KBDSHIFTS:
pInfo->pResult = hb_itemPutNI( pInfo->pResult, hb_gt_w32_getKbdState() );
pInfo->pResult = hb_itemPutNI( pInfo->pResult, hb_gt_winapi_getKbdState() );
if( hb_itemType( pInfo->pNewVal ) & HB_IT_NUMERIC )
hb_gt_w32_setKbdState( hb_itemGetNI( pInfo->pNewVal ) );
hb_gt_winapi_setKbdState( hb_itemGetNI( pInfo->pNewVal ) );
break;
#endif
default:

6
harbour/source/rtl/gtkbstat.c
View File

@@ -53,12 +53,13 @@
/* NOTE: User programs should never call this layer directly! */
#define HB_OS_WIN_USED
#include "hbgtcore.h"
#if defined( HB_OS_WIN )
int hb_gt_w32_getKbdState( void )
int hb_gt_winapi_getKbdState( void )
{
BYTE kbState[256];
int iKbdState = 0;
@@ -79,7 +80,7 @@ int hb_gt_w32_getKbdState( void )
return iKbdState;
}
void hb_gt_w32_setKbdState( int iKbdState )
void hb_gt_winapi_setKbdState( int iKbdState )
{
BYTE kbState[256];
@@ -99,5 +100,4 @@ void hb_gt_w32_setKbdState( int iKbdState )
SetKeyboardState( kbState );
}
#endif /* HB_OS_WIN */

4
harbour/source/rtl/gttone.c
View File

@@ -231,9 +231,9 @@ static void hb_gt_wNtTone( double dFreq, double dDurat )
/* *********************************************************************** */
/* dDuration is in 'Ticks' (18.2 per second) */
void hb_gt_w32_tone( double dFrequency, double dDuration )
void hb_gt_winapi_tone( double dFrequency, double dDuration )
{
HB_TRACE(HB_TR_DEBUG, ("hb_gt_w32_tone(%lf, %lf)", dFrequency, dDuration));
HB_TRACE(HB_TR_DEBUG, ("hb_gt_winapi_tone(%lf, %lf)", dFrequency, dDuration));
/*
* According to the Clipper NG, the duration in 'ticks' is truncated to the

11
harbour/source/rtl/gtwin/gtwin.c
View File

@@ -1502,7 +1502,7 @@ static void hb_gt_win_Tone( PHB_GT pGT, double dFrequency, double dDuration )
HB_SYMBOL_UNUSED( pGT );
hb_gt_w32_tone( dFrequency, dDuration );
hb_gt_winapi_tone( dFrequency, dDuration );
}
/* *********************************************************************** */
@@ -1654,7 +1654,7 @@ static BOOL hb_gt_win_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
case HB_GTI_KBDSHIFTS:
pInfo->pResult = hb_itemPutNI( pInfo->pResult, hb_gt_win_getKbdState() );
if( hb_itemType( pInfo->pNewVal ) & HB_IT_NUMERIC )
hb_gt_w32_setKbdState( hb_itemGetNI( pInfo->pNewVal ) );
hb_gt_winapi_setKbdState( hb_itemGetNI( pInfo->pNewVal ) );
break;
case HB_GTI_KBDSPECIAL:
@@ -1672,14 +1672,15 @@ static BOOL hb_gt_win_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
case HB_GTI_CLIPBOARDDATA:
if( hb_itemType( pInfo->pNewVal ) & HB_IT_STRING )
{
hb_gt_w32_setClipboard( CF_OEMTEXT, hb_itemGetCPtr( pInfo->pNewVal ),
hb_itemGetCLen( pInfo->pNewVal ) );
hb_gt_winapi_setClipboard( CF_OEMTEXT,
hb_itemGetCPtr( pInfo->pNewVal ),
hb_itemGetCLen( pInfo->pNewVal ) );
}
else
{
char * szClipboardData;
ULONG ulLen;
if( hb_gt_w32_getClipboard( CF_OEMTEXT, &szClipboardData, &ulLen ) )
if( hb_gt_winapi_getClipboard( CF_OEMTEXT, &szClipboardData, &ulLen ) )
{
pInfo->pResult = hb_itemPutCLPtr( pInfo->pResult,
szClipboardData,

28
harbour/source/rtl/gtwvt/gtwvt.c
View File

@@ -1007,10 +1007,10 @@ static void hb_gt_wvt_MouseEvent( PHB_GTWVT pWVT, UINT message, WPARAM wParam, L
if( j > 0 )
{
hb_gt_w32_setClipboard( pWVT->CodePage == OEM_CHARSET ?
CF_OEMTEXT : CF_TEXT,
sBuffer,
j );
hb_gt_winapi_setClipboard( pWVT->CodePage == OEM_CHARSET ?
CF_OEMTEXT : CF_TEXT,
sBuffer,
j );
}
hb_xfree( sBuffer );
@@ -1974,7 +1974,7 @@ static void hb_gt_wvt_Tone( PHB_GT pGT, double dFrequency, double dDuration )
HB_SYMBOL_UNUSED( pGT );
hb_gt_w32_tone( dFrequency, dDuration );
hb_gt_winapi_tone( dFrequency, dDuration );
}
/* ********************************************************************** */
@@ -2345,26 +2345,26 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
break;
case HB_GTI_KBDSHIFTS:
pInfo->pResult = hb_itemPutNI( pInfo->pResult, hb_gt_w32_getKbdState() );
pInfo->pResult = hb_itemPutNI( pInfo->pResult, hb_gt_winapi_getKbdState() );
if( hb_itemType( pInfo->pNewVal ) & HB_IT_NUMERIC )
hb_gt_w32_setKbdState( hb_itemGetNI( pInfo->pNewVal ) );
hb_gt_winapi_setKbdState( hb_itemGetNI( pInfo->pNewVal ) );
break;
case HB_GTI_CLIPBOARDDATA:
if( hb_itemType( pInfo->pNewVal ) & HB_IT_STRING )
{
hb_gt_w32_setClipboard( pWVT->CodePage == OEM_CHARSET ?
CF_OEMTEXT : CF_TEXT,
hb_itemGetCPtr( pInfo->pNewVal ),
hb_itemGetCLen( pInfo->pNewVal ) );
hb_gt_winapi_setClipboard( pWVT->CodePage == OEM_CHARSET ?
CF_OEMTEXT : CF_TEXT,
hb_itemGetCPtr( pInfo->pNewVal ),
hb_itemGetCLen( pInfo->pNewVal ) );
}
else
{
char * szClipboardData;
ULONG ulLen;
if( hb_gt_w32_getClipboard( pWVT->CodePage == OEM_CHARSET ?
CF_OEMTEXT : CF_TEXT,
&szClipboardData, &ulLen ) )
if( hb_gt_winapi_getClipboard( pWVT->CodePage == OEM_CHARSET ?
CF_OEMTEXT : CF_TEXT,
&szClipboardData, &ulLen ) )
{
pInfo->pResult = hb_itemPutCLPtr( pInfo->pResult,
szClipboardData,