From 70db9756b13010f84a65230e2605e592f6be81fc Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Sat, 21 Feb 2009 16:04:50 +0000 Subject: [PATCH] 2009-02-21 07:28 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * harbour/contrib/gtwvg/gtwvg.c * harbour/contrib/gtwvg/wvggui.c ! Pacified warnings on 64 bits. --- harbour/ChangeLog | 4 ++++ harbour/contrib/gtwvg/wvgsink.c | 17 ++++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index f02a89e6c3..b4b88431d4 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,10 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-02-21 07:28 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) + * harbour/contrib/gtwvg/wvgsink.c + ! Pacified warnings on 64 bits. + 2009-02-21 07:28 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * harbour/contrib/gtwvg/gtwvg.c * harbour/contrib/gtwvg/wvggui.c diff --git a/harbour/contrib/gtwvg/wvgsink.c b/harbour/contrib/gtwvg/wvgsink.c index 8df3e0d25a..833b487a62 100644 --- a/harbour/contrib/gtwvg/wvgsink.c +++ b/harbour/contrib/gtwvg/wvgsink.c @@ -690,7 +690,7 @@ HB_FUNC( HB_AX_SETUPCONNECTIONPOINT ) hSink->pEvents = hb_itemNew( hb_param( 4, HB_IT_ANY ) ); - hb_stornint( ( LONG ) hSink, 2 ); + hb_stornint( ( HB_PTRDIFF ) hSink, 2 ); hb_storni( n, 3 ); hb_retnl( hr ); } @@ -806,7 +806,7 @@ HB_FUNC( HB_AX_ATLAXCREATECONTROL ) char *class = hb_parc( 1 ); HWND hParent = ( HWND ) ( HB_PTRDIFF ) hb_parnint( 2 ); char *Caption = ISNIL( 4 ) ? "" : hb_parc( 3 ); - HMENU id = ISNIL( 4 ) ? ( HMENU )-1 : ( HMENU ) ( HB_PTRDIFF ) hb_parnint( 4 ); + HMENU id = ISNIL( 4 ) ? ( HMENU ) ( HB_PTRDIFF ) -1 : ( HMENU ) ( HB_PTRDIFF ) hb_parnint( 4 ); int x = ISNIL( 5 ) ? 0 : hb_parni( 5 ); int y = ISNIL( 6 ) ? 0 : hb_parni( 6 ); int w = ISNIL( 7 ) ? 0 : hb_parni( 7 ); @@ -859,8 +859,10 @@ HB_FUNC( HB_AX_ATLAXCREATECONTROL ) pUnk->lpVtbl->Release( pUnk ); 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 ); + #endif } #else if( pUnkCtrl ) @@ -880,18 +882,18 @@ HB_FUNC( HB_AX_ATLAXCREATECONTROL ) } else { - hb_retnl( 0 ); + hb_retnint( 0 ); } } else { - hb_retnl( 0 ); + hb_retnint( 0 ); } // return the container handle if ISBYREF( 12 ) { - hb_stornl( ( long ) hContainer, 12 ); + hb_stornint( ( HB_PTRDIFF ) hContainer, 12 ); } } //---------------------------------------------------------------------------// @@ -908,7 +910,7 @@ HB_FUNC( HB_AX_ATLAXGETCONTROL ) // HWND hWnd = handle of control container wind char *lpcclass = hb_parc( 1 ); HWND hParent = ( HWND ) ( HB_PTRDIFF ) hb_parnint( 2 ); char *Caption = ISNIL( 4 ) ? "" : hb_parc( 3 ); - HMENU id = ISNIL( 4 ) ? ( HMENU )-1 : ( HMENU ) ( HB_PTRDIFF ) hb_parnint( 4 ); + HMENU id = ISNIL( 4 ) ? ( HMENU ) ( HB_PTRDIFF ) -1 : ( HMENU ) ( HB_PTRDIFF ) hb_parnint( 4 ); int x = ISNIL( 5 ) ? 0 : hb_parni( 5 ); int y = ISNIL( 6 ) ? 0 : hb_parni( 6 ); int w = ISNIL( 7 ) ? 0 : hb_parni( 7 ); @@ -953,7 +955,8 @@ HB_FUNC( HB_AX_ATLAXGETCONTROL ) // HWND hWnd = handle of control container wind pUnk->lpVtbl->QueryInterface( pUnk, &IID_IDispatch, ( void** ) (void*) &obj ); pUnk->lpVtbl->Release( pUnk ); GetClientRect( hWnd, &rc ); - MoveWindow( GetDlgItem( hParent, ( int ) id ), 0, 0, rc.right-rc.left, rc.bottom-rc.top, TRUE ); + //MoveWindow( GetDlgItem( hParent, ( int ) id ), 0, 0, rc.right-rc.left, rc.bottom-rc.top, TRUE ); + MoveWindow( hWnd, 0, 0, rc.right-rc.left, rc.bottom-rc.top, TRUE ); hb_retnint( ( HB_PTRDIFF ) obj ); } else