From 472013f959cdbf768bfe5734e8451f369e475477 Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Sat, 12 Jul 2008 23:16:21 +0000 Subject: [PATCH] 2008-07-12 16:12 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * source/rtl/gtwvt/gtwvt.c * #if defined(_MSC_VER) and (_MSC_VER >= 1200) => #if defined(_MSC_VER) && (_MSC_VER >= 1200) *#elif => #else /* JF Please check with BCC also */ --- harbour/ChangeLog | 8 ++++++++ harbour/source/rtl/gtwvt/gtwvt.c | 16 ++++++++-------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 3d90b2849a..3f6180cd2b 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,14 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-07-12 16:12 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) + * source/rtl/gtwvt/gtwvt.c + * #if defined(_MSC_VER) and (_MSC_VER >= 1200) => + #if defined(_MSC_VER) && (_MSC_VER >= 1200) + *#elif => #else + + /* JF Please check with BCC also */ + 2008-07-11 19:52 UTC+0200 JF Lefebvre (MAFACT) (jfl/at/mafact.com) * harbour/source/rtl/gtwvt/gtwvt.c * Reversed my change LONG_PTR to LONG but to HB_LONG type for 64 bit compatibility diff --git a/harbour/source/rtl/gtwvt/gtwvt.c b/harbour/source/rtl/gtwvt/gtwvt.c index 1805d3ca2f..b93c0524b0 100644 --- a/harbour/source/rtl/gtwvt/gtwvt.c +++ b/harbour/source/rtl/gtwvt/gtwvt.c @@ -1445,13 +1445,13 @@ static LRESULT CALLBACK hb_gt_wvt_WndProc( HWND hWnd, UINT message, WPARAM wPara pWVT->bMaximized = FALSE; /* Enable "maximize" button */ - -#if defined(_MSC_VER) and (_MSC_VER <= 1200) + +#if defined(_MSC_VER) && (_MSC_VER <= 1200) SetWindowLongPtr( pWVT->hWnd, GWL_STYLE, WS_OVERLAPPED|WS_CAPTION|WS_SYSMENU|WS_MINIMIZEBOX|WS_MAXIMIZEBOX|WS_THICKFRAME ); -#elif +#else SetWindowLong( pWVT->hWnd, GWL_STYLE, WS_OVERLAPPED|WS_CAPTION|WS_SYSMENU|WS_MINIMIZEBOX|WS_MAXIMIZEBOX|WS_THICKFRAME ); -#endif - +#endif + SetWindowPos( pWVT->hWnd, NULL, 0, 0, 0, 0, SWP_NOACTIVATE | SWP_DRAWFRAME | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_DEFERERASE ); ShowWindow( pWVT->hWnd, SW_HIDE ); @@ -2177,12 +2177,12 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo ) else style = WS_OVERLAPPED|WS_CAPTION|WS_SYSMENU|WS_MINIMIZEBOX|WS_BORDER; -#if defined(_MSC_VER) and (_MSC_VER <= 1200) +#if defined(_MSC_VER) && (_MSC_VER <= 1200) SetWindowLong( pWVT->hWnd, GWL_STYLE, style ); -#elif +#else SetWindowLongPtr( pWVT->hWnd, GWL_STYLE, style ); #endif - + SetWindowPos( pWVT->hWnd, NULL, 0, 0, 0, 0, SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_DEFERERASE ); ShowWindow( pWVT->hWnd, SW_HIDE );