diff --git a/ChangeLog.txt b/ChangeLog.txt index 33fbefb0fe..8bfae1b465 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -10,6 +10,10 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2013-04-05 15:16 UTC+0200 Viktor Szakats (harbour syenar.net) + * extras/gtwvw/* + ! uncrustified + 2013-04-05 15:08 UTC+0200 Viktor Szakats (harbour syenar.net) * bin/check.hb ! made it work regardless of cwd diff --git a/extras/gtwvw/gtwvwd.c b/extras/gtwvw/gtwvwd.c index 74c5e3c4bf..67a662f078 100644 --- a/extras/gtwvw/gtwvwd.c +++ b/extras/gtwvw/gtwvwd.c @@ -101,42 +101,42 @@ /* settable by user: ****************************************************/ #if 0 -static UINT s_uiPaintRefresh = 100; /* milliseconds between timer check */ +static UINT s_uiPaintRefresh = 100; /* milliseconds between timer check */ -static BOOL s_bMainCoordMode = FALSE; /* in this mode, all HB_GT_FUNC() uses Main Window's coordinate */ +static BOOL s_bMainCoordMode = FALSE; /* in this mode, all HB_GT_FUNC() uses Main Window's coordinate */ -static BOOL s_bVertCaret = FALSE; /* if TRUE, caret is in Vertical style */ +static BOOL s_bVertCaret = FALSE; /* if TRUE, caret is in Vertical style */ -static BOOL s_bNOSTARTUPSUBWINDOW = FALSE; /* if TRUE, subwindow will not be displayed during opening */ +static BOOL s_bNOSTARTUPSUBWINDOW = FALSE; /* if TRUE, subwindow will not be displayed during opening */ /* use WVW_NOSTARTUPSUBWINDOW() to check/set it */ -static BOOL s_bDefCentreWindow = FALSE; /* default CentreWindow setting for subwindows */ +static BOOL s_bDefCentreWindow = FALSE; /* default CentreWindow setting for subwindows */ -static BOOL s_bDefHCentreWindow = FALSE; /* default HCentreWindow setting for subwindows */ -static BOOL s_bDefVCentreWindow = FALSE; /* default VCentreWindow setting for subwindows */ +static BOOL s_bDefHCentreWindow = FALSE; /* default HCentreWindow setting for subwindows */ +static BOOL s_bDefVCentreWindow = FALSE; /* default VCentreWindow setting for subwindows */ -static int s_byDefLineSpacing = 0; /* default line spacing */ +static int s_byDefLineSpacing = 0; /* default line spacing */ -static int s_iDefLSpaceColor = -1; /* if >= 0 this will be the color index -for spacing between lines */ +static int s_iDefLSpaceColor = -1; /* if >= 0 this will be the color index + for spacing between lines */ -static BOOL s_bAllowNonTop = FALSE; /* allow non-topmost window's control to -accept input */ +static BOOL s_bAllowNonTop = FALSE; /* allow non-topmost window's control to + accept input */ -static BOOL s_bRecurseCBlock = FALSE; /* allow control's codeblock -to recurse */ +static BOOL s_bRecurseCBlock = FALSE; /* allow control's codeblock + to recurse */ -static LOGFONT s_lfPB = { 0 }; /* default font for pushbuttons */ +static LOGFONT s_lfPB = { 0 }; /* default font for pushbuttons */ -static LOGFONT s_lfSB = { 0 }; /* default font for statusbar */ -static LOGFONT s_lfCB = { 0 }; /* default font for comboboxes */ +static LOGFONT s_lfSB = { 0 }; /* default font for statusbar */ +static LOGFONT s_lfCB = { 0 }; /* default font for comboboxes */ -static LOGFONT s_lfEB = { 0 }; /* default font for editboxes */ +static LOGFONT s_lfEB = { 0 }; /* default font for editboxes */ -static LOGFONT s_lfCX = { 0 }; /* font for 'focused'checkbox */ -static LOGFONT s_lfST = { 0 }; /* font for static control */ +static LOGFONT s_lfCX = { 0 }; /* font for 'focused'checkbox */ +static LOGFONT s_lfST = { 0 }; /* font for static control */ -static HWND hWndTT = 0; /* Window handle Tool Tip */ +static HWND hWndTT = 0; /* Window handle Tool Tip */ #endif /* read only by user ***/ @@ -146,23 +146,23 @@ static HWND hWndTT = 0; /* Window handle Tool Tip */ static BOOL s_bQuickSetMode = FALSE; /* quick SetMode(), to reset maxrow() and maxcol() only */ static BOOL s_bFlashingWindow = FALSE; /* topmost window is flashing -due to invalid input on other -window */ + due to invalid input on other + window */ -static int s_iScrolling = 0; /* scrollbar is scrolling */ -static int s_iWrongButtonUp = 0; /* number of consecutive scrollbar's WM_LBUTTONUP encountered by gtProcessMessages */ -static int s_iMaxWrongButtonUp = 500; /* max number of s_iWrongButtonUp. If it goes higher than this number, -the scrollbar is forced to stop */ +static int s_iScrolling = 0; /* scrollbar is scrolling */ +static int s_iWrongButtonUp = 0; /* number of consecutive scrollbar's WM_LBUTTONUP encountered by gtProcessMessages */ +static int s_iMaxWrongButtonUp = 500; /* max number of s_iWrongButtonUp. If it goes higher than this number, + the scrollbar is forced to stop */ -static TCHAR szAppName[] = TEXT( "Harbour WVW" ); -static TCHAR szSubWinName[] = TEXT( "Harbour WVW subwindows" ); +static TCHAR szAppName[] = TEXT( "Harbour WVW" ); +static TCHAR szSubWinName[] = TEXT( "Harbour WVW subwindows" ); static BOOL s_bSWRegistered = FALSE; -static UINT s_usNumWindows; /*number of windows */ -static UINT s_usCurWindow = 0; /*current window handled by HB_GT_FUNC(...) */ +static UINT s_usNumWindows; /*number of windows */ +static UINT s_usCurWindow = 0; /*current window handled by HB_GT_FUNC(...) */ -static WIN_DATA *s_pWindows[ WVW_MAXWINDOWS ]; /*array of WIN_DATA */ -static APP_DATA s_sApp; /*application wide vars */ +static WIN_DATA * s_pWindows[ WVW_MAXWINDOWS ]; /*array of WIN_DATA */ +static APP_DATA s_sApp; /*application wide vars */ #endif WVW_DATA * s_pWvwData; static BOOL bStartMode = TRUE; @@ -1002,8 +1002,8 @@ static BOOL hb_gt_wvw_SetMode( PHB_GT pGT, int iRow, int iCol ) HB_SYMBOL_UNUSED( pGT ); if( s_pWvwData->s_bQuickSetMode ) /*this is eg. done when we are closing window - *we do nothing here, what we need is performed by GTAPI level - *ie. setting its s_height and s_width (= maxrow() and maxcol() ) + * we do nothing here, what we need is performed by GTAPI level + * ie. setting its s_height and s_width (= maxrow() and maxcol() ) */ return TRUE; @@ -1189,12 +1189,12 @@ static BOOL hb_gt_wvwGetCharFromInputQueue( int * c ) int iNextPos; BOOL bRet = FALSE; - *c = 0; + * c = 0; iNextPos = ( s_pWvwData->s_pWindows[ s_pWvwData->s_usNumWindows-1 ]->keyPointerOut >= WVW_CHAR_QUEUE_SIZE - 1 ) ? 0 : s_pWvwData->s_pWindows[ s_pWvwData->s_usNumWindows-1 ]->keyPointerOut+1 ; if ( iNextPos != s_pWvwData->s_pWindows[ s_pWvwData->s_usNumWindows-1 ]->keyPointerIn ) { - *c = s_pWvwData->s_pWindows[ s_pWvwData->s_usNumWindows-1 ]->Keys[ iNextPos ] ; + * c = s_pWvwData->s_pWindows[ s_pWvwData->s_usNumWindows-1 ]->Keys[ iNextPos ] ; s_pWvwData->s_pWindows[ s_pWvwData->s_usNumWindows-1 ]->keyPointerOut = iNextPos ; bRet = TRUE; } @@ -1344,7 +1344,7 @@ static int hb_gt_wvw_mouse_CountButton( PHB_GT pGT ) /* *********************************************************************** */ /*WARNING: assume working on current window - *NOTES: in MainCoord Mode current window is always the Main Window + * NOTES: in MainCoord Mode current window is always the Main Window */ /* int gt_info(int iMsgType, BOOL bUpdate, int iParam, void *vpParam ) */ static BOOL hb_gt_wvw_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo ) @@ -1593,7 +1593,6 @@ static BOOL hb_gt_wvw_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo ) break; } case HB_GTI_WINTITLE: - { pInfo->pResult = hb_gt_wvw_GetWindowTitle( s_pWvwData->s_usCurWindow, pInfo->pResult ); if( hb_itemType( pInfo->pNewVal ) & HB_IT_STRING ) { @@ -1602,7 +1601,6 @@ static BOOL hb_gt_wvw_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo ) hb_strfree( hWindowTitle ); } break; - } case HB_GTI_CODEPAGE: pInfo->pResult = hb_itemPutNI( pInfo->pResult, pWindowData->CodePage ); iVal = hb_itemGetNI( pInfo->pNewVal ); @@ -1694,7 +1692,7 @@ static BOOL hb_gt_wvw_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo ) if( iY > 0 ) #if 0 BOOL bOldCentre = pWindowData->CentreWindow; - pWVT->CentreWindow = pWVT->bMaximized ? TRUE : FALSE; + pWVT->CentreWindow = pWVT->bMaximized ? TRUE : FALSE; #endif hb_gt_wvw_bSetMode( pWindowData, ( USHORT ) ( iY / pWindowData->PTEXTSIZE.y ), ( USHORT ) ( iX / pWindowData->PTEXTSIZE.x ) ); /* pWindowData->CentreWindow = bOldCentre; */ @@ -1750,7 +1748,7 @@ static BOOL hb_gt_wvw_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo ) #define SetGFXContext() hPen = CreatePen( PS_SOLID, 1, color ); hOldPen = ( HPEN ) SelectObject( hdc, hPen ); hBrush = ( HBRUSH ) CreateSolidBrush( color ); hOldBrush = ( HBRUSH ) SelectObject( hdc, hBrush ); bOut = TRUE /*WARNING: assume working on current window - *NOTES: in MainCoord Mode current window is always the Main Window + * NOTES: in MainCoord Mode current window is always the Main Window */ static int hb_gt_wvw_gfxPrimitive( PHB_GT pGT, int iType, int iTop, int iLeft, int iBottom, int iRight, int iColor ) @@ -2521,7 +2519,7 @@ static void xUserPaintNow( UINT usWinNum ) static BOOL bRunning = FALSE; /*make sure we don't execute it > 1 time - *eg. if s_pWvwData->s_uiPaintRefresh is too small + * eg. if s_pWvwData->s_uiPaintRefresh is too small */ if( bRunning ) return; @@ -2562,8 +2560,8 @@ static void xUserTimerNow( UINT usWinNum, HWND hWnd, UINT message, WPARAM wParam static BOOL bRunning = FALSE; /*make sure we don't execute it > 1 time - *eg. if timer interval is too small - *the call will be lost in this case + * eg. if timer interval is too small + * the call will be lost in this case */ if( bRunning ) return; @@ -3019,10 +3017,10 @@ static LRESULT CALLBACK hb_gt_wvwWndProc( HWND hWnd, UINT message, WPARAM wParam } #if 0 - if ( hb_gt_gobjects != NULL ) - { - s_wvw_paintGraphicObjects( hdc, &updateRect ); - } + if( hb_gt_gobjects != NULL ) + { + s_wvw_paintGraphicObjects( hdc, &updateRect ); + } #endif SelectObject( hdc, hOldFont ); @@ -3104,8 +3102,8 @@ static LRESULT CALLBACK hb_gt_wvwWndProc( HWND hWnd, UINT message, WPARAM wParam if( s_pWvwData->s_sApp->pSymWVW_KILLFOCUS ) #if 0 - hb_vmPushState(); - hb_vmPushSymbol( s_pWvwData->s_sApp->pSymWVW_KILLFOCUS->pSymbol ); + hb_vmPushState(); + hb_vmPushSymbol( s_pWvwData->s_sApp->pSymWVW_KILLFOCUS->pSymbol ); #endif if( hb_vmRequestReenter() ) { @@ -3653,7 +3651,7 @@ static LRESULT CALLBACK hb_gt_wvwWndProc( HWND hWnd, UINT message, WPARAM wParam RECT rectCorner; /* long lSBColorForeground, lSBColorBackground; */ - size_t stLen; + size_t stLen; const TCHAR * pEnd; pWindowData->bSBPaint = FALSE; @@ -5046,9 +5044,9 @@ static void hb_gt_wvwWindowEpilogue( void ) static UINT hb_gt_wvwOpenWindow( LPCTSTR lpszWinName, int iRow1, int iCol1, int iRow2, int iCol2, DWORD dwStyle, int iParentWin ) /*assume s_pWvwData->s_usNumWindows >= 1 (ie. this will be the second or third window) - *this is similar to gt_init(), only gt_init() is for Main Window - *usRowx and usColx determine the initial position and initial size of window - *(relative to MAIN window, NOT to parent window) + * this is similar to gt_init(), only gt_init() is for Main Window + * usRowx and usColx determine the initial position and initial size of window + *(relative to MAIN window, NOT to parent window) */ { HWND hWnd; @@ -5190,7 +5188,7 @@ static UINT hb_gt_wvwOpenWindow( LPCTSTR lpszWinName, int iRow1, int iCol1, int } static void hb_gt_wvwCloseWindow( void ) /*assume s_pWvwData->s_usNumWindows >= 2 (ie. we are not closing main window) - *similar to gt_exit(), only gt_exit() closes main window + * similar to gt_exit(), only gt_exit() closes main window */ { WIN_DATA * pWindowData; @@ -5397,9 +5395,9 @@ static void hb_gt_wvwInputNotAllowed( UINT usWinNum, UINT message, WPARAM wParam oldCoordMode := WVW_SetMainCoord( .t. ) Illustration: - +------ - |Main Window (Window 0) - |maxrow()=24 maxcol()=79 + *+------ + *|Main Window (Window 0) + *|maxrow()=24 maxcol()=79 | +--------------- | |Window1 RowOfs=3 ColOfs=4 | |maxrow()=9 maxcol()=29 @@ -5461,7 +5459,7 @@ USHORT hb_gt_wvwColOfs( UINT usWinNum ) } /*(usrow,uscol) is coordinate relative to Main Window (MainCoord Mode) - *returns true if usrow and uscol is within maxrow() and maxcol() of Window usWinNum + * returns true if usrow and uscol is within maxrow() and maxcol() of Window usWinNum */ static BOOL hb_gt_wvwInWindow( UINT usWinNum, USHORT usrow, USHORT uscol ) { @@ -5472,7 +5470,7 @@ static BOOL hb_gt_wvwInWindow( UINT usWinNum, USHORT usrow, USHORT uscol ) } /*returns winnum containing (usRow,usCol) coordinate - *only meaningful in s_pWvwData->s_bMainCoordMode + * only meaningful in s_pWvwData->s_bMainCoordMode */ static UINT hb_gt_wvwFindWindow( USHORT usRow, USHORT usCol ) { @@ -5550,8 +5548,8 @@ void hb_wvw_HBFUNCPrologue( UINT usWinNum, } /*assigns a new value to s_pWvwData->s_usCurWindow - *returns old value of s_pWvwData->s_usCurWindow - *WARNING!! we must make sure that it is done in !s_pWvwData->s_bMainCoordMode, otherwise + * returns old value of s_pWvwData->s_usCurWindow + * WARNING!! we must make sure that it is done in !s_pWvwData->s_bMainCoordMode, otherwise * some GT_FUNC will be trapped into circular reference! */ static UINT hb_gt_wvwSetCurWindow( UINT usWinNum ) @@ -5568,7 +5566,7 @@ static UINT hb_gt_wvwSetCurWindow( UINT usWinNum ) s_pWvwData->s_bMainCoordMode = FALSE; /*updating GTAPI's statics: - *tell GTAPI about the new maxrow(), maxcol() + * tell GTAPI about the new maxrow(), maxcol() */ s_pWvwData->s_bQuickSetMode = TRUE; @@ -7184,8 +7182,8 @@ HB_FUNC( WVW_SIZE_READY ) /*WVW_lCloseWindow() - *closes the last/topmost window - *returns .t. if successful + * closes the last/topmost window + * returns .t. if successful */ HB_FUNC( WVW_LCLOSEWINDOW ) { @@ -7222,7 +7220,7 @@ HB_FUNC( WVW_LCLOSEWINDOW ) } /*WVW_nNumWindows() - *returns number of windows opened (including main window) + * returns number of windows opened (including main window) */ HB_FUNC( WVW_NNUMWINDOWS ) { @@ -7230,7 +7228,7 @@ HB_FUNC( WVW_NNUMWINDOWS ) } /*WVW_xReposWindow(lAnchored) - *reposition all windows to their initial position + * reposition all windows to their initial position * * if lAnchored == .t. (default) * all subwindows are positioned according to their respective (row1,col1) coordinate @@ -7286,8 +7284,8 @@ HB_FUNC( WVW_NSETCURWINDOW ) } /*WVW_nRowOfs( [nWinNum] ) - *returns row offset of window #nWinNum (0==MAIN), relative to Main Window - *nWinNum defaults to current window + * returns row offset of window #nWinNum (0==MAIN), relative to Main Window + * nWinNum defaults to current window */ HB_FUNC( WVW_NROWOFS ) { @@ -7297,8 +7295,8 @@ HB_FUNC( WVW_NROWOFS ) } /*WVW_nColOfs( [nWinNum] ) - *returns col offset of window #nWinNum (0==MAIN), relative to Main Window - *nWinNum defaults to topmost window + * returns col offset of window #nWinNum (0==MAIN), relative to Main Window + * nWinNum defaults to topmost window */ HB_FUNC( WVW_NCOLOFS ) { @@ -7308,8 +7306,8 @@ HB_FUNC( WVW_NCOLOFS ) } /* - *WVW_MAXMAXROW( [nWinNum] ) - *returns maximum possible MAXROW() in current screen setting for font used by window nWinNum + * WVW_MAXMAXROW( [nWinNum] ) + * returns maximum possible MAXROW() in current screen setting for font used by window nWinNum * */ HB_FUNC( WVW_MAXMAXROW ) @@ -7324,8 +7322,8 @@ HB_FUNC( WVW_MAXMAXROW ) } /* - *WVW_MAXMAXCOL( [nWinNum] ) - *returns maximum possible MAXCOL() in current screen setting for font used by window nWinNum + * WVW_MAXMAXCOL( [nWinNum] ) + * returns maximum possible MAXCOL() in current screen setting for font used by window nWinNum * */ HB_FUNC( WVW_MAXMAXCOL ) @@ -7340,7 +7338,7 @@ HB_FUNC( WVW_MAXMAXCOL ) } /* - *WVW_UNREACHEDBR( [nWinNum], [nBottomPixels], [nRightPixels] ) + * WVW_UNREACHEDBR( [nWinNum], [nBottomPixels], [nRightPixels] ) * get unreached pixels * below maxrow() to nBottomPixels * and on the right of maxcols() to nRightPixels @@ -7359,8 +7357,8 @@ HB_FUNC( WVW_UNREACHEDBR ) } /*WVW_SetMainCoord( [lMainCoord] ) - *returns old setting of s_pWvwData->s_bMainCoordMode, - *then assigns s_pWvwData->s_bMainCoordMode := lMainCoord (if supplied) + * returns old setting of s_pWvwData->s_bMainCoordMode, + * then assigns s_pWvwData->s_bMainCoordMode := lMainCoord (if supplied) */ HB_FUNC( WVW_SETMAINCOORD ) { @@ -7598,9 +7596,9 @@ HB_FUNC( WVW_ENABLEMAXIMIZE ) /*WVW_SetPaintRefresh( [nPaintRefresh] ) - *returns old setting of s_pWvwData->s_uiPaintRefresh (millisec between calls to WVW_PAINT) - *then assigns s_pWvwData->s_uiPaintRefresh:= nPaintRefresh (if supplied) - *NOTES: nPaintRefresh must be >= 50 + * returns old setting of s_pWvwData->s_uiPaintRefresh (millisec between calls to WVW_PAINT) + * then assigns s_pWvwData->s_uiPaintRefresh:= nPaintRefresh (if supplied) + * NOTES: nPaintRefresh must be >= 50 * or nPaintRefresh == 0, causing Repaint to execute immediately, as GTWVT */ HB_FUNC( WVW_SETPAINTREFRESH ) @@ -7629,10 +7627,10 @@ HB_FUNC( WVW_SETPAINTREFRESH ) } /*WVW_SetVertCaret( [lOn] ) - *if lOn is supplied: - *lOn == .t.: turn caret into vertical caret - *lOn == .f.: turn caret into horizontal caret - *return old setting of s_pWvwData->s_bVertCaret + * if lOn is supplied: + * lOn == .t.: turn caret into vertical caret + * lOn == .f.: turn caret into horizontal caret + * return old setting of s_pWvwData->s_bVertCaret */ /*TODO: do you want to make it window selective?*/ HB_FUNC( WVW_SETVERTCARET ) @@ -7654,9 +7652,9 @@ HB_FUNC( WVW_SETVERTCARET ) } /*WVW_SetDefCentreWindow( [lCentre] ) - *returns old setting of s_pWvwData->s_bDefCentreWindow (default CentreWindow setting for newly opened subwindow) - *then assigns s_pWvwData->s_bDefCentreWindow := lCentre (if supplied) - *NOTES: + * returns old setting of s_pWvwData->s_bDefCentreWindow (default CentreWindow setting for newly opened subwindow) + * then assigns s_pWvwData->s_bDefCentreWindow := lCentre (if supplied) + * NOTES: * - lCentre will be the default CentreWindow for all subwindow opens */ HB_FUNC( WVW_SETDEFCENTREWINDOW ) @@ -7670,9 +7668,9 @@ HB_FUNC( WVW_SETDEFCENTREWINDOW ) } /*WVW_SetDefHCentreWindow( [lCentre] ) - *returns old setting of s_pWvwData->s_bDefHCentreWindow (default horizontal CentreWindow setting for newly opened subwindow) - *then assigns s_pWvwData->s_bDefHCentreWindow := lCentre (if supplied) - *NOTES: + * returns old setting of s_pWvwData->s_bDefHCentreWindow (default horizontal CentreWindow setting for newly opened subwindow) + * then assigns s_pWvwData->s_bDefHCentreWindow := lCentre (if supplied) + * NOTES: * - lCentre will be the default CentreWindow for all subwindow opens */ HB_FUNC( WVW_SETDEFHCENTREWINDOW ) @@ -7686,9 +7684,9 @@ HB_FUNC( WVW_SETDEFHCENTREWINDOW ) } /*WVW_SetDefVCentreWindow( [lCentre] ) - *returns old setting of s_pWvwData->s_bDefVCentreWindow (default horizontal CentreWindow setting for newly opened subwindow) - *then assigns s_pWvwData->s_bDefVCentreWindow := lCentre (if supplied) - *NOTES: + * returns old setting of s_pWvwData->s_bDefVCentreWindow (default horizontal CentreWindow setting for newly opened subwindow) + * then assigns s_pWvwData->s_bDefVCentreWindow := lCentre (if supplied) + * NOTES: * - lCentre will be the default CentreWindow for all subwindow opens */ HB_FUNC( WVW_SETDEFVCENTREWINDOW ) @@ -7702,9 +7700,9 @@ HB_FUNC( WVW_SETDEFVCENTREWINDOW ) } /*WVW_SetDefLineSpacing( [nLineSpacing] ) - *returns old setting of s_pWvwData->s_byDefLineSpacing (default linespacing between lines) - *then assigns s_pWvwData->s_byDefLineSpacing:= nLineSpacing (if supplied) - *NOTES: + * returns old setting of s_pWvwData->s_byDefLineSpacing (default linespacing between lines) + * then assigns s_pWvwData->s_byDefLineSpacing:= nLineSpacing (if supplied) + * NOTES: * - nLineSpacing will be the default line spacing for all window opens * - nLineSpacing must be even, positive number <= 40 * otherwise it will be ignored @@ -7722,9 +7720,9 @@ HB_FUNC( WVW_SETDEFLINESPACING ) } /*WVW_SetLineSpacing( [nWinNum], [nLineSpacing] ) - *returns old setting of linespacing between lines in window nWinNum - *then set the line spacing to nLineSpacing (if supplied) - *NOTES: + * returns old setting of linespacing between lines in window nWinNum + * then set the line spacing to nLineSpacing (if supplied) + * NOTES: * - nLineSpacing must be even, positive number <= 40 * otherwise it will be ignored * - if window size will become too high, line spacing is restored @@ -7759,9 +7757,9 @@ HB_FUNC( WVW_SETLINESPACING ) } /*WVW_SetDefLSpaceColor( [nColorIndex] ) - *returns old setting of s_pWvwData->s_iDefLSpaceColor (color index of spacing between lines) - *then assigns s_pWvwData->s_iDefLSpaceColor:= nColorIndex (if supplied) - *NOTES: + * returns old setting of s_pWvwData->s_iDefLSpaceColor (color index of spacing between lines) + * then assigns s_pWvwData->s_iDefLSpaceColor:= nColorIndex (if supplied) + * NOTES: * - nColorIndex will be the default line spacing color for all window opens * - nColorIndex must >= 0 and <= 15, or == -1 * nCOlorIndex == 0:black, 1:blue, ..., 7:white, ..., 15:bright white @@ -7779,9 +7777,9 @@ HB_FUNC( WVW_SETDEFLSPACECOLOR ) } /*WVW_SetLSpaceColor( [nWinNum], [nColorIndex] ) - *returns old setting of line space color in window nWinNum - *then set the line spacing color to nColorIndex (if supplied) - *NOTES: + * returns old setting of line space color in window nWinNum + * then set the line spacing color to nColorIndex (if supplied) + * NOTES: * - nColorIndex must be >= 0 and <= 15, or -1 * otherwise it will be ignored * nCOlorIndex == 0:black, 1:blue, ..., 7:white, ..., 15:bright white @@ -7852,10 +7850,10 @@ HB_FUNC( WVW_RECURSECBLOCK ) } /*WVW_NoStartupSubWindow( [lOn] ) - *if lOn is supplied: - *lOn == .t.: when opening window, window will not be displayed - *lOn == .f.: when opening window, window will be displayed (default) - *return old setting of s_bNOSTARTUPWINDOW + * if lOn is supplied: + * lOn == .t.: when opening window, window will not be displayed + * lOn == .f.: when opening window, window will be displayed (default) + * return old setting of s_bNOSTARTUPWINDOW */ HB_FUNC( WVW_NOSTARTUPSUBWINDOW ) { @@ -9150,8 +9148,8 @@ LRESULT CALLBACK hb_gt_wvwTBProc( HWND hWnd, UINT message, WPARAM wParam, LPARAM hb_gt_wvwTBMouseEvent( pWindowData, hWnd, message, wParam, lParam ); #if 0 - return( 0 ); - TB_ISBUTTONHIGHLIGHTED + return 0; + TB_ISBUTTONHIGHLIGHTED #endif case WM_PAINT: { @@ -9853,8 +9851,8 @@ UINT ButtonCreate( UINT usWinNum, USHORT usTop, USHORT usLeft, USHORT usBottom, AddControlHandle( usWinNum, WVW_CONTROL_PUSHBUTTON, hWndButton, uiPBid, ( PHB_ITEM ) phbiCodeBlock, rXB, rOffXB, ( byte ) iStyle ); #if 0 - OldProc = SetWindowLongPtr (hWndButton, - GWLP_WNDPROC, (LONG_PTR)hb_gt_wvwBtnProc) ; + OldProc = SetWindowLongPtr( hWndButton, + GWLP_WNDPROC, ( LONG_PTR ) hb_gt_wvwBtnProc ); #endif OldProc = SubclassWindow( hWndButton, hb_gt_wvwBtnProc ); diff --git a/extras/gtwvw/hbgtwvw.h b/extras/gtwvw/hbgtwvw.h index 7f44c86468..838b537cd9 100644 --- a/extras/gtwvw/hbgtwvw.h +++ b/extras/gtwvw/hbgtwvw.h @@ -610,9 +610,9 @@ typedef struct wvw_data }WVW_DATA; #if 0 -#define HB_RETHANDLE( h ) hb_retptr( ( void * ) ( h ) ) -#define HB_PARHANDLE( n ) hb_parptr( n ) -#define HB_STOREHANDLE( h, n ) hb_storptr( ( void * ) ( h ), n ) +#define HB_RETHANDLE( h ) hb_retptr( ( void * ) ( h ) ) +#define HB_PARHANDLE( n ) hb_parptr( n ) +#define HB_STOREHANDLE( h, n ) hb_storptr( ( void * ) ( h ), n ) #endif #define HB_RETHANDLE( h ) hb_retnl( ( LONG ) ( h ) ) #define HB_PARHANDLE( n ) ( ( LONG ) hb_parnl( n ) ) diff --git a/extras/gtwvw/wvwcheck.c b/extras/gtwvw/wvwcheck.c index 4dfdf50a1b..048c7cf05b 100644 --- a/extras/gtwvw/wvwcheck.c +++ b/extras/gtwvw/wvwcheck.c @@ -152,7 +152,7 @@ HB_FUNC( WVW_CXCREATE ) } /*WVW_CXdestroy( [nWinNum], nCXid ) - *destroy checkbox nCXid for window nWinNum + * destroy checkbox nCXid for window nWinNum */ HB_FUNC( WVW_CXDESTROY ) { @@ -188,7 +188,7 @@ HB_FUNC( WVW_CXDESTROY ) } /*WVW_CXsetFocus( [nWinNum], nButtonId ) - *set the focus to checkbox nButtonId in window nWinNum + * set the focus to checkbox nButtonId in window nWinNum */ HB_FUNC( WVW_CXSETFOCUS ) { @@ -204,10 +204,10 @@ HB_FUNC( WVW_CXSETFOCUS ) } /*WVW_CXenable( [nWinNum], nButtonId, [lToggle] ) - *enable/disable checkbox nButtonId on window nWinNum - *(lToggle defaults to .t., ie. enabling the checkbox) - *return previous state of the checkbox (TRUE:enabled FALSE:disabled) - *(if nButtonId is invalid, this function returns FALSE too) + * enable/disable checkbox nButtonId on window nWinNum + *(lToggle defaults to .t., ie. enabling the checkbox) + * return previous state of the checkbox (TRUE:enabled FALSE:disabled) + *(if nButtonId is invalid, this function returns FALSE too) */ HB_FUNC( WVW_CXENABLE ) { @@ -230,7 +230,7 @@ HB_FUNC( WVW_CXENABLE ) } /*WVW_CXsetcodeblock( [nWinNum], nCXid, bBlock ) - *assign (new) codeblock bBlock to button nCXid for window nWinNum + * assign (new) codeblock bBlock to button nCXid for window nWinNum * * return .t. if successful */ @@ -287,7 +287,7 @@ HB_FUNC( WVW_CXSETCHECK ) } /*WVW_CXgetcheck( [nWinNum], nCXid ) - *returns check-state of checkbox nCXid + * returns check-state of checkbox nCXid * 0==unchecked BST_UNCHECKED * 1==checked BST_CHECKED * 2==indeterminate BST_INDETERMINATE @@ -517,8 +517,8 @@ HB_FUNC( WVW_PGCREATE ) } /*WVW_PGdestroy( [nWinNum], nPGid ) - *destroy progressbar nPGid for window nWinNum - *This function has no return value. + * destroy progressbar nPGid for window nWinNum + * This function has no return value. */ HB_FUNC( WVW_PGDESTROY ) { @@ -585,9 +585,9 @@ HB_FUNC( WVW_PGSETRANGE ) } /*WVW_PGsetpos(nWinNum, PGid, [nPos]) - *update progressbar position within current range - *nPos: a number in range of current range - *returns .t. if operation considered successfull + * update progressbar position within current range + * nPos: a number in range of current range + * returns .t. if operation considered successfull */ HB_FUNC( WVW_PGSETPOS ) { @@ -619,8 +619,8 @@ HB_FUNC( WVW_PGSETPOS ) } /*WVW_PGgetpos(nWinNum, PGid) - *get progressbar current position - *returns 0 if operation failed + * get progressbar current position + * returns 0 if operation failed */ HB_FUNC( WVW_PGGETPOS ) { diff --git a/extras/gtwvw/wvwdraw.c b/extras/gtwvw/wvwdraw.c index 08937c3284..bd45aed77c 100644 --- a/extras/gtwvw/wvwdraw.c +++ b/extras/gtwvw/wvwdraw.c @@ -1397,8 +1397,8 @@ HB_FUNC( WVW_DRAWIMAGE_RESOURCE ) pPic = rr_LoadPictureFromResource( NULL, hb_parni( 6 ), &lImgWidth, &lImgHeight ); #if 0 - lImgWidth = iImgWidth; - lImgHeight = iImgHeight; + lImgWidth = iImgWidth; + lImgHeight = iImgHeight; #endif if( pPic == NULL ) diff --git a/extras/gtwvw/wvwedit.c b/extras/gtwvw/wvwedit.c index 5b767dea72..8e9f1d09b7 100644 --- a/extras/gtwvw/wvwedit.c +++ b/extras/gtwvw/wvwedit.c @@ -260,7 +260,7 @@ HB_FUNC( WVW_EBCREATE ) } /*WVW_EBdestroy( [nWinNum], nEBid ) - *destroy editbox nEBid for window nWinNum + * destroy editbox nEBid for window nWinNum */ HB_FUNC( WVW_EBDESTROY ) { @@ -296,7 +296,7 @@ HB_FUNC( WVW_EBDESTROY ) } /*WVW_EBsetFocus( [nWinNum], nEditId ) - *set the focus to editbox nEditId in window nWinNum + * set the focus to editbox nEditId in window nWinNum */ HB_FUNC( WVW_EBSETFOCUS ) { @@ -312,7 +312,7 @@ HB_FUNC( WVW_EBSETFOCUS ) } /*WVW_EBisFocused( [nWinNum], nEditId ) - *returns .t. if the focus is on editbox nEditId in window nWinNum + * returns .t. if the focus is on editbox nEditId in window nWinNum */ HB_FUNC( WVW_EBISFOCUSED ) { @@ -325,10 +325,10 @@ HB_FUNC( WVW_EBISFOCUSED ) } /*WVW_EBenable( [nWinNum], nEditId, [lEnable] ) - *enable/disable editbox nEditId on window nWinNum - *(lEnable defaults to .t., ie. enabling the editbox) - *return previous state of the editbox (TRUE:enabled FALSE:disabled) - *(if nEditId is invalid, this function returns FALSE too) + * enable/disable editbox nEditId on window nWinNum + *(lEnable defaults to .t., ie. enabling the editbox) + * return previous state of the editbox (TRUE:enabled FALSE:disabled) + *(if nEditId is invalid, this function returns FALSE too) */ HB_FUNC( WVW_EBENABLE ) { @@ -351,10 +351,10 @@ HB_FUNC( WVW_EBENABLE ) } /*WVW_EBeditable( [nWinNum], nEditId, [lEditable] ) - *get/set editability attribute from editbox nEditId on window nWinNum - *(if lEditable is not specified, no change to editability) - *return previous state of the editbox (TRUE:editable FALSE:not editable) - *(if nEditId is invalid, this function returns FALSE too) + * get/set editability attribute from editbox nEditId on window nWinNum + *(if lEditable is not specified, no change to editability) + * return previous state of the editbox (TRUE:editable FALSE:not editable) + *(if nEditId is invalid, this function returns FALSE too) */ HB_FUNC( WVW_EBEDITABLE ) { @@ -383,7 +383,7 @@ HB_FUNC( WVW_EBEDITABLE ) } /*WVW_EBsetcodeblock( [nWinNum], nEBid, bBlock ) - *assign (new) codeblock bBlock to editbox nEBid for window nWinNum + * assign (new) codeblock bBlock to editbox nEBid for window nWinNum * * return .t. if successful */ @@ -480,9 +480,9 @@ HB_FUNC( WVW_EBSETFONT ) } /*WVW_EBIsMultiline( [nWinNum], nEBid ) - *returns .t. if editbox nEBid in window nWinNum is multiline - *otherwise .f. - *Also returns .f. if nEBid not valid + * returns .t. if editbox nEBid in window nWinNum is multiline + * otherwise .f. + * Also returns .f. if nEBid not valid */ HB_FUNC( WVW_EBISMULTILINE ) { @@ -565,8 +565,8 @@ HB_FUNC( WVW_EBGETTEXT ) } /*WVW_EBsettext( [nWinNum], nEBid, cText ) - *set current text of editbox nEBid in window nWinNum - *returns .t. if successful, .f. in case of error (eg. nEBid not valid) + * set current text of editbox nEBid in window nWinNum + * returns .t. if successful, .f. in case of error (eg. nEBid not valid) */ HB_FUNC( WVW_EBSETTEXT ) { @@ -606,11 +606,11 @@ HB_FUNC( WVW_EBSETTEXT ) } /*WVW_EBgetsel( [nWinNum], nEBid, @nstart, @nend ) - *get selected text editbox nEBid in window nWinNum - *the start selected text (0-based) is in nstart - *the end selected text (0-based) is in nend - *returns .t. if operation successful - *returns .f. if not (eg. nEBid not valid) + * get selected text editbox nEBid in window nWinNum + * the start selected text (0-based) is in nstart + * the end selected text (0-based) is in nend + * returns .t. if operation successful + * returns .f. if not (eg. nEBid not valid) */ HB_FUNC( WVW_EBGETSEL ) { @@ -639,13 +639,13 @@ HB_FUNC( WVW_EBGETSEL ) } /*WVW_EBsetsel( [nWinNum], nEBid, nstart, nend ) - *set selected text editbox nEBid in window nWinNum - *the start selected text (0-based) is in nstart - *the end selected text (0-based) is in nend - *notes: nstart may be > nend (flipped selection) - *notes: to selet all text: WVW_EBsetsel(nwinnum, nebid, 0, -1) - *returns .t. if operation successful - *returns .f. if not (eg. nEBid not valid) + * set selected text editbox nEBid in window nWinNum + * the start selected text (0-based) is in nstart + * the end selected text (0-based) is in nend + * notes: nstart may be > nend (flipped selection) + * notes: to selet all text: WVW_EBsetsel(nwinnum, nebid, 0, -1) + * returns .t. if operation successful + * returns .f. if not (eg. nEBid not valid) */ HB_FUNC( WVW_EBSETSEL ) { @@ -678,9 +678,10 @@ HB_FUNC( WVW_STCREATE ) WVW_DATA * pData = hb_getWvwData(); HWND hWndParent = pWindowData->hWnd; HWND hWndCB; + #if 0 RECT r; - HDC hDc; + HDC hDc; #endif POINT xy = { 0 }; diff --git a/extras/gtwvw/wvwfuncs.c b/extras/gtwvw/wvwfuncs.c index 0f3a5ca0ee..7535a9c841 100644 --- a/extras/gtwvw/wvwfuncs.c +++ b/extras/gtwvw/wvwfuncs.c @@ -626,9 +626,9 @@ HB_FUNC( BRINGTOTOP1 ) HWND hWnd = ( HWND ) HB_PARHANDLE( 1 ); #if 0 -DWORD ForegroundThreadID; -DWORD ThisThreadID; -DWORD timeout; + DWORD ForegroundThreadID; + DWORD ThisThreadID; + DWORD timeout; #endif if( IsIconic( hWnd ) ) @@ -868,12 +868,12 @@ HB_FUNC( OPENIMAGE ) } #if 0 -#if defined(__cplusplus) -OleLoadPicture( pStream,0,0,&IID_IPicture,(void**)&pPic ); -pStream->Release(); +#if defined( __cplusplus ) + OleLoadPicture( pStream, 0, 0, &IID_IPicture, ( void ** ) &pPic ); + pStream->Release(); #else - OleLoadPicture( pStream, 0, 0, &IID_IPicture, ( void ** ) &pPic ); - pStream->lpVtbl->Release( pStream ); + OleLoadPicture( pStream, 0, 0, &IID_IPicture, ( void ** ) &pPic ); + pStream->lpVtbl->Release( pStream ); #endif #endif @@ -886,20 +886,20 @@ pStream->Release(); } #if 0 -#if defined(__cplusplus) -pPic->get_Handle( (OLE_HANDLE*)&hBitmap ); +#if defined( __cplusplus ) + pPic->get_Handle( ( OLE_HANDLE * ) &hBitmap ); #else - pPic->lpVtbl->get_Handle( pPic, ( OLE_HANDLE * ) &hBitmap ); + pPic->lpVtbl->get_Handle( pPic, ( OLE_HANDLE * ) &hBitmap ); #endif #endif hb_retnl( ( LONG ) CopyImage( hBitmap, IMAGE_BITMAP, 0, 0, LR_COPYRETURNORG ) ); #if 0 -#if defined(__cplusplus) -pPic->Release(); +#if defined( __cplusplus ) + pPic->Release(); #else - pPic->lpVtbl->Release( pPic ); + pPic->lpVtbl->Release( pPic ); #endif #endif } @@ -1192,15 +1192,15 @@ HB_FUNC( TOOLBARADDBUTTONS ) /* bSystem = hb_arrayGetL( pTemp, 9 ); */ #if 0 - if (bSystem) - if (ulID > 0 && ulID < 31 ) - { - tb[ ulCount ].iBitmap = ulID > 0 ? ( int ) ulID : -1; - } - else - { - tb[ ulCount ].iBitmap = ulID > 0 ? ( int ) ulCount : -1; - } + if( bSystem ) + if( ulID > 0 && ulID < 31 ) + { + tb[ ulCount ].iBitmap = ulID > 0 ? ( int ) ulID : -1; + } + else + { + tb[ ulCount ].iBitmap = ulID > 0 ? ( int ) ulCount : -1; + } #endif tb[ ulCount ].idCommand = hb_arrayGetNI( pTemp, 2 ); tb[ ulCount ].fsState = ( BYTE ) hb_arrayGetNI( pTemp, 3 ); @@ -1382,10 +1382,10 @@ HB_FUNC( WVW_NUMBMCACHE ) /*WVW_SetTimer([nWinNum], nInterval) - *set timer event for every nInterval millisec - *(effective only if WVW_TIMER() function exists) - *eg. it can be usefull to update clock on status bar - *returns .t. if successfull + * set timer event for every nInterval millisec + *(effective only if WVW_TIMER() function exists) + * eg. it can be usefull to update clock on status bar + * returns .t. if successfull */ /*20040602: WARNING: WVT is slightly different*/ HB_FUNC( WVW_SETTIMER ) @@ -1406,8 +1406,8 @@ HB_FUNC( WVW_SETTIMER ) } /*WVW_KillTimer([nWinNum]) - *kill the timer event handler for window nWinNum - *returns .t. if successfull + * kill the timer event handler for window nWinNum + * returns .t. if successfull */ /*20040602: WARNING: WVT is slightly different */ HB_FUNC( WVW_KILLTIMER ) diff --git a/extras/gtwvw/wvwmenu.c b/extras/gtwvw/wvwmenu.c index 79506eeb49..e24836c694 100644 --- a/extras/gtwvw/wvwmenu.c +++ b/extras/gtwvw/wvwmenu.c @@ -203,12 +203,12 @@ HB_FUNC( WVW_SETMENUKEYEVENT ) } #if 0 - WVW_MENUITEM_SETBITMAPS( - hMenu, - nIDEnableItem, - nPosition, - ncBitmapUnchecked, - ncBimapChecked ) +WVW_MENUITEM_SETBITMAPS( + hMenu, + nIDEnableItem, + nPosition, + ncBitmapUnchecked, + ncBimapChecked ) #endif HB_FUNC( WVW_MENUITEM_SETBITMAPS ) { @@ -354,8 +354,8 @@ HB_FUNC( WVW_NOSYSMENU ) } /* WVW_GetSystemMenu( [nWinNum], lReset ) - *returns the System Menu of a window - *if lRemoveClose is .t., also removes the 'Close' command and 'X' button + * returns the System Menu of a window + * if lRemoveClose is .t., also removes the 'Close' command and 'X' button */ HB_FUNC( WVW_GETSYSTEMMENU ) { diff --git a/extras/gtwvw/wvwpush.c b/extras/gtwvw/wvwpush.c index f467c7bb86..c86082999f 100644 --- a/extras/gtwvw/wvwpush.c +++ b/extras/gtwvw/wvwpush.c @@ -151,7 +151,7 @@ HB_FUNC( WVW_PBCREATE ) } /*WVW_PBdestroy( [nWinNum], nPBid ) - *destroy button nPBid for window nWinNum + * destroy button nPBid for window nWinNum */ HB_FUNC( WVW_PBDESTROY ) { @@ -187,7 +187,7 @@ HB_FUNC( WVW_PBDESTROY ) } /*WVW_PBsetFocus( [nWinNum], nButtonId ) - *set the focus to button nButtonId in window nWinNum + * set the focus to button nButtonId in window nWinNum */ HB_FUNC( WVW_PBSETFOCUS ) { @@ -203,7 +203,7 @@ HB_FUNC( WVW_PBSETFOCUS ) } /*WVW_PBisFocused( [nWinNum], nPBid ) - *returns .t. if the focus is on button nPBid in window nWinNum + * returns .t. if the focus is on button nPBid in window nWinNum */ HB_FUNC( WVW_PBISFOCUSED ) { @@ -216,10 +216,10 @@ HB_FUNC( WVW_PBISFOCUSED ) } /*WVW_PBenable( [nWinNum], nButtonId, [lToggle] ) - *enable/disable button nButtonId on window nWinNum - *(lToggle defaults to .t., ie. enabling the button) - *return previous state of the button (TRUE:enabled FALSE:disabled) - *(if nButtonId is invalid, this function returns FALSE too) + * enable/disable button nButtonId on window nWinNum + *(lToggle defaults to .t., ie. enabling the button) + * return previous state of the button (TRUE:enabled FALSE:disabled) + *(if nButtonId is invalid, this function returns FALSE too) */ HB_FUNC( WVW_PBENABLE ) { @@ -242,7 +242,7 @@ HB_FUNC( WVW_PBENABLE ) } /*WVW_PBsetcodeblock( [nWinNum], nPBid, bBlock ) - *assign (new) codeblock bBlock to button nPBid for window nWinNum + * assign (new) codeblock bBlock to button nPBid for window nWinNum * * return .t. if successful */ @@ -605,7 +605,7 @@ HB_FUNC( WVW_CBCREATE ) } /*WVW_CBdestroy( [nWinNum], nCBid ) - *destroy combobox nCBid for window nWinNum + * destroy combobox nCBid for window nWinNum */ HB_FUNC( WVW_CBDESTROY ) { @@ -641,7 +641,7 @@ HB_FUNC( WVW_CBDESTROY ) } /*WVW_CBsetFocus( [nWinNum], nComboId ) - *set the focus to combobox nComboId in window nWinNum + * set the focus to combobox nComboId in window nWinNum */ HB_FUNC( WVW_CBSETFOCUS ) { @@ -657,7 +657,7 @@ HB_FUNC( WVW_CBSETFOCUS ) } /*WVW_CBisFocused( [nWinNum], nComboId ) - *returns .t. if the focus is on combobox nComboId in window nWinNum + * returns .t. if the focus is on combobox nComboId in window nWinNum */ HB_FUNC( WVW_CBISFOCUSED ) { @@ -670,10 +670,10 @@ HB_FUNC( WVW_CBISFOCUSED ) } /*WVW_CBenable( [nWinNum], nComboId, [lEnable] ) - *enable/disable button nComboId on window nWinNum - *(lEnable defaults to .t., ie. enabling the combobox) - *return previous state of the combobox (TRUE:enabled FALSE:disabled) - *(if nComboId is invalid, this function returns FALSE too) + * enable/disable button nComboId on window nWinNum + *(lEnable defaults to .t., ie. enabling the combobox) + * return previous state of the combobox (TRUE:enabled FALSE:disabled) + *(if nComboId is invalid, this function returns FALSE too) */ HB_FUNC( WVW_CBENABLE ) { @@ -696,7 +696,7 @@ HB_FUNC( WVW_CBENABLE ) } /*WVW_CBsetcodeblock( [nWinNum], nCBid, bBlock ) - *assign (new) codeblock bBlock to combobox nCBid for window nWinNum + * assign (new) codeblock bBlock to combobox nCBid for window nWinNum * * return .t. if successful */ @@ -889,8 +889,8 @@ HB_FUNC( WVW_CBFINDSTRING ) } /*WVW_cbGetCurText( [nWinNum], nCBid ) - *get current selected cString in combobox nCBid in window nWinNum - *returns "" if none selected + * get current selected cString in combobox nCBid in window nWinNum + * returns "" if none selected * */ HB_FUNC( WVW_CBGETCURTEXT ) @@ -937,9 +937,9 @@ HB_FUNC( WVW_CBGETCURTEXT ) } /*WVW_cbIsDropped( [nWinNum], nCBid ) - *get current dropped state of combobox nCBid in window nWinNum - *returns .t. if listbox is being shown, otherwise .f. - *Also returns .f. if nCBid not valid + * get current dropped state of combobox nCBid in window nWinNum + * returns .t. if listbox is being shown, otherwise .f. + * Also returns .f. if nCBid not valid */ HB_FUNC( WVW_CBISDROPPED ) { diff --git a/extras/gtwvw/wvwstbar.c b/extras/gtwvw/wvwstbar.c index c8e9ad3c5c..35f1197b47 100644 --- a/extras/gtwvw/wvwstbar.c +++ b/extras/gtwvw/wvwstbar.c @@ -78,9 +78,9 @@ /*WVW_SBcreate( [nWinNum] ) - *create status bar for window nWinNum, with one part. - *returns handle to status bar of windows nWinNum - *returns 0 if failed, eg. if there is already a status bar for this window + * create status bar for window nWinNum, with one part. + * returns handle to status bar of windows nWinNum + * returns 0 if failed, eg. if there is already a status bar for this window */ HB_FUNC( WVW_SBCREATE ) { @@ -125,7 +125,7 @@ HB_FUNC( WVW_SBCREATE ) } /*WVW_SBdestroy( [nWinNum] ) - *destroy status bar for window nWinNum + * destroy status bar for window nWinNum */ HB_FUNC( WVW_SBDESTROY ) { @@ -238,10 +238,10 @@ HB_FUNC( WVW_SBADDPART ) } /*WVW_SBrefresh(nWinNum) - *reinitialize StatusBar's parts, eg. after window resize - *TODO: do it automatically, after hb_gt_wvwResetWindowSize() - *returns number of parts - *returns 0 if failed + * reinitialize StatusBar's parts, eg. after window resize + * TODO: do it automatically, after hb_gt_wvwResetWindowSize() + * returns number of parts + * returns 0 if failed */ HB_FUNC( WVW_SBREFRESH ) { @@ -280,7 +280,7 @@ HB_FUNC( WVW_SBREFRESH ) } /*WVW_SBsetText([nWinNum], [nPart], cText) - *Set Text of status bar's part #npart + * Set Text of status bar's part #npart */ HB_FUNC( WVW_SBSETTEXT ) { @@ -315,7 +315,7 @@ HB_FUNC( WVW_SBSETTEXT ) } /*WVW_SBgetText([nWinNum], [nPart]) - *Get Text of status bar's part #npart + * Get Text of status bar's part #npart */ HB_FUNC( WVW_SBGETTEXT ) { @@ -329,7 +329,7 @@ HB_FUNC( WVW_SBGETTEXT ) } /*WVW_SBgetparts([nWinNum]) - *Get number of parts in statusbar of window nWinNum + * Get number of parts in statusbar of window nWinNum */ HB_FUNC( WVW_SBGETPARTS ) { @@ -386,12 +386,12 @@ HB_FUNC( WVW_SBSETFONT ) /*WVW_XBcreate( [nWinNum], nStyle, nTop, nLeft, nLength, bBlock, aOffset) - *create scroll bar for window nWinNum - *nStyle: SBS_HORZ (0)=horizontal, SBS_VERT (1)=vertical - *nTop: row of top/left corner (in character unit) - *nLeft: col of top/left corner (in character unit) - *nLength: length of scrollbar (in character unit) - *NOTES: width of scrollbar (in character unit) + * create scroll bar for window nWinNum + * nStyle: SBS_HORZ (0)=horizontal, SBS_VERT (1)=vertical + * nTop: row of top/left corner (in character unit) + * nLeft: col of top/left corner (in character unit) + * nLength: length of scrollbar (in character unit) + * NOTES: width of scrollbar (in character unit) * horiz: defaults to one character height * verti: defaults to one character _height_ too (!) * use aOffset to adjust the dimension @@ -552,7 +552,7 @@ HB_FUNC( WVW_XBCREATE ) } /*WVW_XBdestroy( [nWinNum], nXBid ) - *destroy scrollbar nXBid for window nWinNum + * destroy scrollbar nXBid for window nWinNum */ HB_FUNC( WVW_XBDESTROY ) { @@ -588,11 +588,11 @@ HB_FUNC( WVW_XBDESTROY ) } /*WVW_XBupdate(nWinNum, XBid, [nPos], [nPageSize], [nMin], [nMax]) - *update scrollbar data and its display - *nPos, nPageSize, nMin, nMax are optional. - *however, both nMin & nMax must be supplied, or not at all. - *returns current position of scroll thumb. - *returns -1 if update failed. + * update scrollbar data and its display + * nPos, nPageSize, nMin, nMax are optional. + * however, both nMin & nMax must be supplied, or not at all. + * returns current position of scroll thumb. + * returns -1 if update failed. */ HB_FUNC( WVW_XBUPDATE ) { diff --git a/extras/gtwvw/wvwtbar.c b/extras/gtwvw/wvwtbar.c index 759a9d0095..e188d03ca6 100644 --- a/extras/gtwvw/wvwtbar.c +++ b/extras/gtwvw/wvwtbar.c @@ -74,10 +74,10 @@ #include "hbgtwvw.h" /*WVW_TBCreate([nWinNum], lDisplayText, nStyle, nSystemBitmap, nImageWidth, nImageHeight) - *creates a toolbar at the top (no button initially) - *lDisplayText==.f. button's string is used as tooltips (default) - *nStyle: toolbar style, defaults to TBSTYLE_FLAT | TBSTYLE_TOOLTIPS - *nSystemBitmap: 0:none, 1:small, 2:large (defaults: 1) + * creates a toolbar at the top (no button initially) + * lDisplayText==.f. button's string is used as tooltips (default) + * nStyle: toolbar style, defaults to TBSTYLE_FLAT | TBSTYLE_TOOLTIPS + * nSystemBitmap: 0:none, 1:small, 2:large (defaults: 1) * small=16x16 large=24x24 * nImageWidth/Height are in effect only if nSystemBitmap==0 */ @@ -292,7 +292,7 @@ HB_FUNC( WVW_TBADDBUTTON ) } /*WVW_TBButtonCount([nWinNum]) - *returns number of buttons in toolbar on window nWinNum + * returns number of buttons in toolbar on window nWinNum */ HB_FUNC( WVW_TBBUTTONCOUNT ) { @@ -311,9 +311,9 @@ HB_FUNC( WVW_TBBUTTONCOUNT ) } /*WVW_TBDelButton([nWinNum], nButton) - *nButton is zero based index of button to delete - *index=0 is the leftmost button - *NOTE: button separator is indexed and deleteable too + * nButton is zero based index of button to delete + * index=0 is the leftmost button + * NOTE: button separator is indexed and deleteable too */ HB_FUNC( WVW_TBDELBUTTON ) { @@ -386,10 +386,10 @@ HB_FUNC( WVW_TBGETBUTTONRECT ) /*WVW_TBEnableButton([nWinNum], nButton, [lToggle]) - *nButton is zero based index of button to enable/disable - *index=0 is the leftmost button - *NOTE: button separator is indexed too - *returns .t. if successful + * nButton is zero based index of button to enable/disable + * index=0 is the leftmost button + * NOTE: button separator is indexed too + * returns .t. if successful */ HB_FUNC( WVW_TBENABLEBUTTON ) { @@ -432,7 +432,7 @@ HB_FUNC( WVW_TBENABLEBUTTON ) } /*WVW_TBdestroy( [nWinNum] ) - *destroy toolbar for window nWinNum + * destroy toolbar for window nWinNum */ HB_FUNC( WVW_TBDESTROY ) { @@ -450,8 +450,8 @@ HB_FUNC( WVW_TBDESTROY ) } /*WVW_TBINDEX2CMD([nWinNum], nIndex) - *returns Command Id of button nIndex (0 based) - *returns -1 if the button does not exist + * returns Command Id of button nIndex (0 based) + * returns -1 if the button does not exist */ HB_FUNC( WVW_TBINDEX2CMD ) { @@ -465,8 +465,8 @@ HB_FUNC( WVW_TBINDEX2CMD ) } /*WVW_TBCmd2Index([nWinNum], nCmd) - *returns Index (0 based) of button whose command id is nCmd - *returns -1 if the button does not exist + * returns Index (0 based) of button whose command id is nCmd + * returns -1 if the button does not exist */ HB_FUNC( WVW_TBCMD2INDEX ) {