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

2012-01-31 00:37 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)

Browse Source 
* harbour/contrib/gtwvg/wvgwin.c
    ! fixed wrongly used string handler instead of string pointer as
      HB_STORSTR() parameter
    ! added missing casting for C++ mode
    ! added casting to pacify warning
This commit is contained in:
Przemyslaw Czerpak
2012-01-30 23:37:56 +00:00
parent 76e3f5afd6
commit 720cf3e820
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
harbour/ChangeLog
View File

@@ -16,6 +16,13 @@
The license applies to all entries newer than 2009-04-28.
*/
2012-01-31 00:37 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* harbour/contrib/gtwvg/wvgwin.c
! fixed wrongly used string handler instead of string pointer as
HB_STORSTR() parameter
! added missing casting for C++ mode
! added casting to pacify warning
2012-01-30 15:19 UTC+0100 Viktor Szakats (harbour syenar.net)
* utils/hbmk2/hbmk2.prg
* config/postinst.hbs

18
harbour/contrib/gtwvg/wvgwin.c
View File

@@ -125,19 +125,17 @@ static HINSTANCE wvg_hInstance( void )
HB_FUNC( WVG_SENDMESSAGE )
{
void * hText = NULL;
LPTSTR lpText = HB_PARSTR( 4, &hText, NULL );
hb_retnl( ( HB_ULONG ) SendMessage( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ),
( UINT ) hb_parni( 2 ),
( ! HB_ISNUM( 3 ) ? 0 : ( WPARAM ) hb_parnint( 3 ) ),
( HB_ISCHAR( 4 ) ? ( LPARAM ) HB_PARSTR( 4, &hText, NULL ) :
( LPARAM ) hb_parnint( 4 ) ) ) );
if( hText )
( lpText ? ( LPARAM ) lpText : ( LPARAM ) hb_parnint( 4 ) ) ) );
if( lpText )
{
if( HB_ISBYREF( 4 ) )
{
HB_STORSTR( hText, 4 );
}
HB_STORSTR( lpText, 4 );
hb_strfree( hText );
}
hb_strfree( hText );
}
/*----------------------------------------------------------------------*/
@@ -1549,7 +1547,7 @@ HB_FUNC( WVG_SENDCBMESSAGE )
case CB_GETLBTEXT : // Gets a string from the list of a combo box.
{
int iSize = SendMessage( hCB, CB_GETLBTEXTLEN, hb_parni( 3 ), 0 );
TCHAR * text = hb_xgrab( iSize + 1 );
LPTSTR text = ( LPTSTR ) hb_xgrab( iSize + 1 );
SendMessage( hCB, CB_GETLBTEXT, iSize, ( LPARAM ) text );
HB_RETSTR( text );
hb_xfree( text );
@@ -1606,7 +1604,7 @@ HB_FUNC( WVG_SENDCBMESSAGE )
hb_retni( SendMessage( hCB, CB_SETITEMHEIGHT, hb_parni( 3 ), 0 ) );
break;
case CB_SETLOCALE : // An application sends a CB_SETLOCALE message to set the current locale of the combo box. If the combo box has the CBS_SORT style and strings are added using CB_ADDSTRING, the locale of a combo box affects how list items are sorted.
hb_retnint( SendMessage( hCB, CB_SETLOCALE, hb_parnint( 3 ), 0 ) );
hb_retnint( SendMessage( hCB, CB_SETLOCALE, ( WPARAM ) hb_parnint( 3 ), 0 ) );
break;
#if ( _WIN32_IE >= 0x0600 )
case CB_SETMINVISIBLE : // An application sends a CB_SETMINVISIBLE message to set the minimum number of visible items in the drop-down list of a combo box.