From dbe1f130d8d60a51c95226bd81974490a4c5bbfe Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 7 Oct 2009 07:58:23 +0000 Subject: [PATCH] 2009-10-07 09:58 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * source/rtl/gtwvt/gtwvt.h * source/rtl/gtwvt/gtwvt.c - Deleted artificial screen dimension limits and WVT_MAX_{ROW,COL} macros. --- harbour/ChangeLog | 5 ++++ harbour/source/rtl/gtwvt/gtwvt.c | 41 +++++++++++++++----------------- harbour/source/rtl/gtwvt/gtwvt.h | 2 -- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 638f94580c..35ce833f51 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,11 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-10-07 09:58 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * source/rtl/gtwvt/gtwvt.h + * source/rtl/gtwvt/gtwvt.c + - Deleted artificial screen dimension limits and WVT_MAX_{ROW,COL} macros. + 2009-10-07 09:11 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/source/rtl/gtwvt/gtwvt.h * harbour/source/rtl/gtwvt/gtwvt.c diff --git a/harbour/source/rtl/gtwvt/gtwvt.c b/harbour/source/rtl/gtwvt/gtwvt.c index 40c6b4c696..b0a56b5320 100644 --- a/harbour/source/rtl/gtwvt/gtwvt.c +++ b/harbour/source/rtl/gtwvt/gtwvt.c @@ -1975,33 +1975,30 @@ static BOOL hb_gt_wvt_SetMode( PHB_GT pGT, int iRow, int iCol ) pWVT = HB_GTWVT_GET( pGT ); - if( iRow <= WVT_MAX_ROWS && iCol <= WVT_MAX_COLS ) + if( pWVT->hWnd ) /* Is the window already open */ { - if( pWVT->hWnd ) /* Is the window already open */ - { - HFONT hFont = hb_gt_wvt_GetFont( pWVT->fontFace, pWVT->fontHeight, pWVT->fontWidth, - pWVT->fontWeight, pWVT->fontQuality, pWVT->CodePage ); + HFONT hFont = hb_gt_wvt_GetFont( pWVT->fontFace, pWVT->fontHeight, pWVT->fontWidth, + pWVT->fontWeight, pWVT->fontQuality, pWVT->CodePage ); - if( hFont ) - { - /* - * make sure that the mode selected along with the current - * font settings will fit in the window - */ - if( hb_gt_wvt_ValidWindowSize( pWVT->hWnd, iRow, iCol, hFont, pWVT->fontWidth ) ) - fResult = hb_gt_wvt_InitWindow( pWVT, iRow, iCol, hFont ); - else - DeleteObject( hFont ); - - HB_GTSELF_REFRESH( pGT ); - } - } - else + if( hFont ) { - fResult = hb_gt_wvt_SetWindowSize( pWVT, iRow, iCol ); - HB_GTSELF_SEMICOLD( pGT ); + /* + * make sure that the mode selected along with the current + * font settings will fit in the window + */ + if( hb_gt_wvt_ValidWindowSize( pWVT->hWnd, iRow, iCol, hFont, pWVT->fontWidth ) ) + fResult = hb_gt_wvt_InitWindow( pWVT, iRow, iCol, hFont ); + else + DeleteObject( hFont ); + + HB_GTSELF_REFRESH( pGT ); } } + else + { + fResult = hb_gt_wvt_SetWindowSize( pWVT, iRow, iCol ); + HB_GTSELF_SEMICOLD( pGT ); + } return fResult; } diff --git a/harbour/source/rtl/gtwvt/gtwvt.h b/harbour/source/rtl/gtwvt/gtwvt.h index 14b63376fe..f1ab57813f 100644 --- a/harbour/source/rtl/gtwvt/gtwvt.h +++ b/harbour/source/rtl/gtwvt/gtwvt.h @@ -72,8 +72,6 @@ #define WVT_CHAR_QUEUE_SIZE 128 #define WVT_MAX_TITLE_SIZE 128 -#define WVT_MAX_ROWS 256 -#define WVT_MAX_COLS 256 #define WVT_MAX_WINDOWS 256 #if defined( HB_OS_WIN_CE ) # define WVT_DEFAULT_ROWS 15