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

2009-02-21 13:00 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)

Browse Source 
* harbour/contrib/gtwvg/wvgsink.c
  * harbour/contrib/gtwvg/wvgutils.c
  * harbour/contrib/gtwvg/wvgwin.c
    ! Pacified more warnings on 64bits.
This commit is contained in:
Pritpal Bedi
2009-02-21 21:01:51 +00:00
parent a7839840aa
commit 9ae8cd0497
4 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
harbour/ChangeLog
View File

@@ -8,6 +8,12 @@
2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2009-02-21 13:00 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
* harbour/contrib/gtwvg/wvgsink.c
* harbour/contrib/gtwvg/wvgutils.c
* harbour/contrib/gtwvg/wvgwin.c
! Pacified more warnings on 64bits.
2009-02-21 19:31 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* bin/hb-func.sh
* harbour.spec

10
harbour/contrib/gtwvg/wvgsink.c
View File

@@ -802,7 +802,6 @@ HB_FUNC( HB_AX_ATLAXCREATECONTROL )
UINT uLen;
PATLAXCREATECONTROL AtlAxCreateControl;
HWND hContainer = NULL;
RECT rc;
char *class = hb_parc( 1 );
HWND hParent = ( HWND ) ( HB_PTRDIFF ) hb_parnint( 2 );
char *Caption = ISNIL( 4 ) ? "" : hb_parc( 3 );
@@ -860,13 +859,18 @@ HB_FUNC( HB_AX_ATLAXCREATECONTROL )
hb_retnint( ( HB_PTRDIFF ) obj );
#if 0
GetClientRect( hContainer, &rc );
MoveWindow( GetDlgItem( hContainer, ( int ) id ), 0, 0, rc.right-rc.left, rc.bottom-rc.top, TRUE );
{
RECT rc;
GetClientRect( hContainer, &rc );
MoveWindow( GetDlgItem( hContainer, ( int ) id ), 0, 0, rc.right-rc.left, rc.bottom-rc.top, TRUE );
}
#endif
}
#else
if( pUnkCtrl )
{
RECT rc;
pUnkCtrl->lpVtbl->QueryInterface( pUnkCtrl, &IID_IDispatch, ( void** ) (void*) &obj );
pUnkCtrl->lpVtbl->Release( pUnkCtrl );
hb_retnint( ( long ) obj );

3
harbour/contrib/gtwvg/wvgutils.c
View File

@@ -1260,8 +1260,7 @@ HB_FUNC( WVT__MAKEDLGTEMPLATE )
p = lpwAlign( p );
//hb_retclen( ( LPSTR ) pdlgtemplate, ( ( HB_PTRDIFF ) p - ( HB_PTRDIFF ) pdlgtemplate ) ) ;
hb_retclen( ( LPSTR ) pdlgtemplate, ( ( WORD ) p - ( WORD ) pdlgtemplate ) ) ;
hb_retclen( ( LPSTR ) pdlgtemplate, ( ( HB_PTRDIFF ) p - ( HB_PTRDIFF ) pdlgtemplate ) ) ;
LocalFree( LocalHandle( pdlgtemplate ) );
}

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

@@ -918,7 +918,7 @@ HB_FUNC( WIN_CREATETOOLBAREX )
HWND hWnd;
hWnd = CreateToolbarEx( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ),
( HB_PTRDIFF ) hb_parnint( 2 ),
( DWORD ) hb_parnint( 2 ),
hb_parni( 3 ),
hb_parni( 4 ),
ISNIL( 5 ) ? NULL : ( HINSTANCE ) ( HB_PTRDIFF ) hb_parnint( 5 ),
@@ -1414,7 +1414,7 @@ HB_FUNC( WIN_SETWNDPROC )
#if (defined(_MSC_VER) && (_MSC_VER <= 1200 || defined(HB_OS_WIN_CE)) || defined(__DMC__)) && !defined(HB_ARCH_64BIT)
oldProc = ( WNDPROC ) SetWindowLong( hWnd, GWL_WNDPROC, ( long ) wndProc ) ;
#else
oldProc = ( WNDPROC ) SetWindowLongPtr( hWnd, GWLP_WNDPROC, ( long ) wndProc ) ;
oldProc = ( WNDPROC ) SetWindowLongPtr( hWnd, GWLP_WNDPROC, ( HB_PTRDIFF ) wndProc ) ;
#endif
hb_retnint( ( HB_PTRDIFF ) oldProc );
@@ -1471,7 +1471,7 @@ HB_FUNC( WVG_GETNMMOUSEINFO )
hb_arraySetNI( pEvParams , 1, nmh.code );
hb_arraySetNInt( pEvParams, 2, ( HB_PTRDIFF ) nmh.idFrom );
hb_arraySetNInt( pEvParams, 3, ( HB_PTRDIFF ) nmh.hwndFrom );
hb_arraySetNL( pEvParams , 4, nmm->dwItemSpec );
hb_arraySetNInt( pEvParams, 4, ( HB_PTRDIFF ) nmm->dwItemSpec );//hb_arraySetNL( pEvParams , 4, nmm->dwItemSpec );
hb_itemReturnRelease( pEvParams );
}
@@ -2118,7 +2118,11 @@ HB_FUNC( WVG_ADDTOOLBARBUTTON )
// set bitmap
//
tbab.hInst = NULL;
#if (_WIN32_IE >= 0x0500)
tbab.nID = wapi_par_HBITMAP( 2 );
#else
tbab.nID = ( UINT ) wapi_par_HBITMAP( 2 );
#endif
iNewBitmap = ( int ) SendMessage( hWndTB, TB_ADDBITMAP, ( WPARAM ) 1, ( LPARAM ) &tbab );
// set string
@@ -2181,14 +2185,14 @@ HB_FUNC( WIN_SENDTOOLBARMESSAGE )
case TB_ADDBITMAP :
{
TBADDBITMAP tbab;
int iBitmap;
tbab.hInst = NULL;
#if (_WIN32_IE >= 0x0500)
tbab.nID = wapi_par_HBITMAP( 3 );
#else
tbab.nID = ( UINT ) wapi_par_HBITMAP( 3 );
iBitmap = SendMessage( hTB, TB_ADDBITMAP, ( WPARAM ) 1, ( LPARAM ) &tbab );
wapi_ret_NI( iBitmap );
#endif
wapi_ret_NI( ( int ) SendMessage( hTB, TB_ADDBITMAP, ( WPARAM ) 1, ( LPARAM ) &tbab ) );
}
break;
case TB_ADDBUTTONS :