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

2012-11-10 18:17 UTC+0100 Viktor Szakats (harbour syenar.net)

Browse Source 
* bin/harbour.ucf
    + enabled some options to delete unwanted newlines
      in a few places.
    + enabled to remove double semicolons
    * added default pp formatting option for future mods

  * extras/gtwvw/gtwvwd.c
  * extras/gtwvw/wvwcheck.c
  * extras/gtwvw/wvwdraw.c
  * extras/gtwvw/wvwedit.c
  * extras/gtwvw/wvwfuncs.c
  * extras/gtwvw/wvwmenu.c
  * extras/gtwvw/wvwpush.c
  * extras/gtwvw/wvwstbar.c
  * extras/gtwvw/wvwtbar.c
    ! uncrustified more agressively by using these extra options:
      mod_full_brace_for  = remove
      mod_full_brace_if   = remove
      mod_full_brace_while= remove
    ! some commented code converted to #if 0/#endif blocks
    ! one code line changed to avoid uncrustify bug

  * extras/gtwvw/tests/drawimg.prg
    ! avoided GPF caused by WVW function when GT is not
      yet initialized. This should ideally be fixed in the
      GT itself.

  * extras/gtwvw/tests/inpfocus.prg
    ! fixed lines broken by an older version of hbformat

  * extras/gtwvw/hbole.h
    ! deleted non-ANSI C comments
This commit is contained in:
Viktor Szakats
2012-11-10 17:23:06 +00:00
parent 19df5c8b46
commit ce1993077d
14 changed files with 402 additions and 2111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
harbour/ChangeLog
View File

@@ -16,6 +16,40 @@
The license applies to all entries newer than 2009-04-28.
*/
2012-11-10 18:17 UTC+0100 Viktor Szakats (harbour syenar.net)
* bin/harbour.ucf
+ enabled some options to delete unwanted newlines
in a few places.
+ enabled to remove double semicolons
* added default pp formatting option for future mods
* extras/gtwvw/gtwvwd.c
* extras/gtwvw/wvwcheck.c
* extras/gtwvw/wvwdraw.c
* extras/gtwvw/wvwedit.c
* extras/gtwvw/wvwfuncs.c
* extras/gtwvw/wvwmenu.c
* extras/gtwvw/wvwpush.c
* extras/gtwvw/wvwstbar.c
* extras/gtwvw/wvwtbar.c
! uncrustified more agressively by using these extra options:
mod_full_brace_for = remove
mod_full_brace_if = remove
mod_full_brace_while= remove
! some commented code converted to #if 0/#endif blocks
! one code line changed to avoid uncrustify bug
* extras/gtwvw/tests/drawimg.prg
! avoided GPF caused by WVW function when GT is not
yet initialized. This should ideally be fixed in the
GT itself.
* extras/gtwvw/tests/inpfocus.prg
! fixed lines broken by an older version of hbformat
* extras/gtwvw/hbole.h
! deleted non-ANSI C comments
2012-11-10 17:02 UTC+0100 Viktor Szakats (harbour syenar.net)
* extras/hbxlsxml/tests/example.prg
* extras/hbxlsxml/tests/example2.prg

35
harbour/bin/harbour.ucf
View File

@@ -39,7 +39,10 @@ nl_fcall_brace = force # "list_for_each() {" vs "list_for_each()\n{"
nl_fdef_brace = force # "int foo() {" vs "int foo()\n{"
# nl_after_return = true;
# nl_before_case = 1
nl_end_of_file = force # ignore/add/remove/force
nl_end_of_file_min = 1 # number
# nl_multi_line_define = true
nl_max = 3
#
# Source code modifications
@@ -86,7 +89,7 @@ mod_pawn_semicolon = false # false/true
mod_full_paren_if_bool = false # false/true
# Whether to remove superfluous semicolons
mod_remove_extra_semicolon = false # false/true
mod_remove_extra_semicolon = true # false/true
# If a function body exceeds the specified number of newlines and doesn't have a comment after
# the close brace, a comment will be added.
@@ -587,3 +590,31 @@ ls_for_split_full = false # false/true
# Whether to fully split long function protos/calls at commas
ls_func_split_full = false # false/true
#
# Preprocessor options
#
# Control indent of preprocessors inside #if blocks at brace level 0
pp_indent = ignore # ignore/add/remove/force
# Whether to indent #if/#else/#endif at the brace level (true) or from column 1 (false)
pp_indent_at_level = false # false/true
# If pp_indent_at_level=false, specifies the number of columns to indent per level. Default=1.
pp_indent_count = 1 # number
# Add or remove space after # based on pp_level of #if blocks
pp_space = ignore # ignore/add/remove/force
# Sets the number of spaces added with pp_space
pp_space_count = 0 # number
# If pp_indent_at_level=true, sets the indent for #if, #else, and #endif when not at file-level
pp_indent_if = 0 # number
# Control whether to indent the code between #if, #else and #endif when not at file-level
pp_if_indent_code = false # false/true
# Whether to indent '#define' at the brace level (true) or from column 1 (false)
pp_define_at_level = false # false/true

1691
harbour/extras/gtwvw/gtwvwd.c
View File

File diff suppressed because it is too large Load Diff

6
harbour/extras/gtwvw/hbole.h
View File

@@ -88,7 +88,7 @@
#ifndef _SYS_GUID_OPERATOR_EQ_
#define _SYS_GUID_OPERATOR_EQ_ 1
#endif // _SYS_GUID_OPERATOR_EQ_
#endif
#endif // _MSC_VER
#endif // HB_OLE_H_
#endif
#endif

8
harbour/extras/gtwvw/tests/drawimg.prg
View File

@@ -84,9 +84,9 @@ PROCEDURE Main()
nrig := MaxCol() - 2, ;
nmidver := Int( ( ntop + nbot ) / 2 ), ;
nmidhor := Int( ( nleft + nrig ) / 2 )
LOCAL cpict := "vouch1.gif", ;
ltransp := .F., ;
nMaxCache := wvw_SetMaxBMcache()
LOCAL cpict := "vouch1.gif"
LOCAL ltransp := .F.
LOCAL nMaxCache
LOCAL i, j, oWPaint
LOCAL getlist := {}
@@ -94,6 +94,8 @@ PROCEDURE Main()
hbshell_gtSelect( "GTWVW" )
#endif
nMaxCache := wvw_SetMaxBMcache()
SetColor( "N/W,N/GR*,,,N/W*" )
wvw_setcodepage( , 255 )
wg_ResetWPaintObj( 0 )

13
harbour/extras/gtwvw/tests/inpfocus.prg
View File

@@ -99,12 +99,9 @@ STATIC FUNCTION CreateToolbar( nWinNum )
ENDIF
/* using system std & view bitmaps */
wvw_tbAddButton( nWinNum, IDM_OPENWIN, STD_FILENEW, "Open a new typewriter window", 1 /*system std bitmap*/
)
wvw_tbAddButton( nWinNum, IDM_CLOSEWIN, STD_DELETE, "Close last window", 1 /*system std bitmap*/
)
wvw_tbAddButton( nWinNum, IDM_ARRANGEWIN, VIEW_PARENTFOLDER, "Reposition all windows", 2 /*system view bitmap*/
)
wvw_tbAddButton( nWinNum, IDM_OPENWIN, STD_FILENEW, "Open a new typewriter window", 1 /*system std bitmap*/ )
wvw_tbAddButton( nWinNum, IDM_CLOSEWIN, STD_DELETE, "Close last window", 1 /*system std bitmap*/ )
wvw_tbAddButton( nWinNum, IDM_ARRANGEWIN, VIEW_PARENTFOLDER, "Reposition all windows", 2 /*system view bitmap*/ )
RETURN .T. // CreateToolbar()
@@ -253,7 +250,9 @@ FUNCTION WVW_INPUTFOCUS( nWinNum, hWnd, message, wParam, lParam )
LOCAL wParamHi := WVW_HIWORD( wParam )
LOCAL nCommand, ch
// LOCAL cdebug
#if 0
LOCAL cdebug
#endif
// did user perform a menu/toolbar action on Main Window?
IF message == WM_COMMAND .AND. nWinNum == 0 // menu,toolbar,pushbutton

66
harbour/extras/gtwvw/wvwcheck.c
View File

@@ -169,34 +169,24 @@ HB_FUNC( WVW_CXDESTROY )
while( pcd )
{
if( pcd->byCtrlClass == WVW_CONTROL_CHECKBOX && pcd->uiCtrlid == uiCXid )
{
break;
}
pcdPrev = pcd;
pcd = pcd->pNext;
}
if( pcd == NULL )
{
return;
}
DestroyWindow( pcd->hWndCtrl );
if( pcdPrev == NULL )
{
pWindowData->pcdCtrlList = pcd->pNext;
}
else
{
pcdPrev->pNext = pcd->pNext;
}
if( pcd->phiCodeBlock )
{
hb_itemRelease( pcd->phiCodeBlock );
}
hb_xfree( pcd );
}
@@ -212,14 +202,9 @@ HB_FUNC( WVW_CXSETFOCUS )
HWND hWndCX = FindControlHandle( usWinNum, WVW_CONTROL_CHECKBOX, uiCtrlId, &bStyle );
if( hWndCX )
{
hb_retl( SetFocus( hWndCX ) != NULL );
}
else
{
hb_retl( FALSE );
}
}
/*WVW_CXenable( [nWinNum], nButtonId, [lToggle] )
@@ -242,14 +227,10 @@ HB_FUNC( WVW_CXENABLE )
hb_retl( EnableWindow( hWndCX, bEnable ) == 0 );
if( ! bEnable )
{
SetFocus( pWindowData->hWnd );
}
}
else
{
hb_retl( FALSE );
}
}
/*WVW_CXsetcodeblock( [nWinNum], nCXid, bBlock )
@@ -276,10 +257,8 @@ HB_FUNC( WVW_CXSETCODEBLOCK )
pcd->bBusy = TRUE;
if( pcd->phiCodeBlock )
{
hb_itemRelease( pcd->phiCodeBlock );
}
pcd->phiCodeBlock = hb_itemNew( phiCodeBlock );
@@ -305,10 +284,8 @@ HB_FUNC( WVW_CXSETCHECK )
CONTROL_DATA * pcd = GetControlData( usWinNum, WVW_CONTROL_CHECKBOX, NULL, uiCXid );
if( pcd->hWndCtrl )
{
SendMessage( pcd->hWndCtrl,
BM_SETCHECK, ( WPARAM ) ulCheck, ( LPARAM ) 0 );
}
hb_retl( TRUE );
}
@@ -328,10 +305,8 @@ HB_FUNC( WVW_CXGETCHECK )
CONTROL_DATA * pcd = GetControlData( usWinNum, WVW_CONTROL_CHECKBOX, NULL, uiCXid );
if( pcd->hWndCtrl )
{
ulCheck = SendMessage( pcd->hWndCtrl,
BM_GETCHECK, ( WPARAM ) 0, ( LPARAM ) 0 );
}
hb_retnl( ulCheck );
}
@@ -361,9 +336,7 @@ HB_FUNC( WVW_CXSETFONT )
pData->s_lfCX.lfQuality = HB_ISNIL( 6 ) ? pData->s_lfCX.lfQuality : ( BYTE ) hb_parni( 6 );
pData->s_lfCX.lfPitchAndFamily = FF_DONTCARE;
if( HB_ISCHAR( 2 ) )
{
strcpy( pData->s_lfCX.lfFaceName, hb_parcx( 2 ) );
}
if( pWindowData->hCXfont )
{
@@ -390,9 +363,7 @@ HB_FUNC( WVW_CXSETFONT )
}
else
{
retval = FALSE;
}
}
hb_retl( retval );
@@ -410,26 +381,18 @@ HB_FUNC( WVW_CXSTATUSFONT )
if( pcd->hWndCtrl )
{
if( bFocus )
{
SendMessage( pcd->hWndCtrl, WM_SETFONT, ( WPARAM ) pWindowData->hCXfont, ( LPARAM ) TRUE );
}
else
{
SendMessage( pcd->hWndCtrl, WM_SETFONT, ( WPARAM ) pWindowData->hPBfont, ( LPARAM ) TRUE );
}
}
hb_retl( TRUE );
}
/* CHECKBOX ends */
/* PROGRESSBAR begins */
@@ -493,9 +456,7 @@ HB_FUNC( WVW_PGCREATE )
iOffRight = ! HB_ISNIL( 6 ) ? hb_parvni( 6, 4 ) : 0;
if( hb_gt_wvw_GetMainCoordMode() )
{
hb_wvw_HBFUNCPrologue( usWinNum, &usTop, &usLeft, &usBottom, &usRight );
}
xy = hb_gt_wvwGetXYFromColRow( pWindowData, usLeft, usTop );
iTop = xy.y + iOffTop;
@@ -508,24 +469,14 @@ HB_FUNC( WVW_PGCREATE )
uiPGid = LastControlId( usWinNum, WVW_CONTROL_PROGRESSBAR );
if( uiPGid == 0 )
{
uiPGid = WVW_ID_BASE_PROGRESSBAR;
}
else
{
uiPGid++;
}
if( bVertical )
{
iStyle = iStyle | PBS_VERTICAL;
}
if( bSmooth )
{
iStyle = iStyle | PBS_SMOOTH;
}
hb_winmainArgGet( &hInstance, NULL, NULL );
@@ -549,13 +500,9 @@ HB_FUNC( WVW_PGCREATE )
RECT rXB = { 0 }, rOffXB = { 0 };
if( bBackColor )
{
SendMessage( hWndPG, PBM_SETBKCOLOR, 0, ( LPARAM ) ( COLORREF ) hb_parnl( 7 ) );
}
if( bBarColor )
{
SendMessage( hWndPG, PBM_SETBARCOLOR, 0, ( LPARAM ) ( COLORREF ) hb_parnl( 8 ) );
}
SendMessage( hWndPG, PBM_SETRANGE, 0, MAKELPARAM( 0, 100 ) );
SendMessage( hWndPG, PBM_SETPOS, ( WPARAM ) 0, 0 );
@@ -570,10 +517,7 @@ HB_FUNC( WVW_PGCREATE )
hb_retnl( ( LONG ) uiPGid );
}
else
{
hb_retnl( ( LONG ) 0 );
}
}
/*WVW_PGdestroy( [nWinNum], nPGid )
@@ -591,34 +535,24 @@ HB_FUNC( WVW_PGDESTROY )
while( pcd )
{
if( pcd->byCtrlClass == WVW_CONTROL_PROGRESSBAR && pcd->uiCtrlid == uiPGid )
{
break;
}
pcdPrev = pcd;
pcd = pcd->pNext;
}
if( pcd == NULL )
{
return;
}
DestroyWindow( pcd->hWndCtrl );
if( pcdPrev == NULL )
{
pWindowData->pcdCtrlList = pcd->pNext;
}
else
{
pcdPrev->pNext = pcd->pNext;
}
if( pcd->phiCodeBlock )
{
hb_itemRelease( pcd->phiCodeBlock );
}
hb_xfree( pcd );
}

175
harbour/extras/gtwvw/wvwdraw.c
View File

@@ -128,9 +128,7 @@ HB_FUNC( WVW_DRAWLABELOBJ )
iOffRight = ! HB_ISNIL( 12 ) ? hb_parvni( 12, 4 ) : 0;
if( hb_gt_wvw_GetMainCoordMode() )
{
hb_wvw_HBFUNCPrologue( usWinNum, &usTop, &usLeft, &usBottom, &usRight );
}
xy = hb_gt_wvwGetXYFromColRow( pWindowData, usLeft, usTop );
iTop = xy.y + iOffTop;
@@ -202,7 +200,6 @@ HB_FUNC( WVW_DRAWLABELOBJ )
}
/* */
/* Wvw_DrawToolButtonState( [nWinNum], nTop, nLeft, nBottom, nRight, aPxlOff, nState )*/
/* */
@@ -222,9 +219,7 @@ HB_FUNC( WVW_DRAWTOOLBUTTONSTATE )
usRight = ( USHORT ) hb_parni( 5 );
if( hb_gt_wvw_GetMainCoordMode() )
{
hb_wvw_HBFUNCPrologue( usWinNum, &usTop, &usLeft, &usBottom, &usRight );
}
xy = hb_gt_wvwGetXYFromColRow( pWindowData, usLeft, usTop );
iTop = xy.y + hb_parvni( 6, 1 );
@@ -317,9 +312,7 @@ HB_FUNC( WVW_DRAWSCROLLBUTTON )
usRight = ( USHORT ) hb_parni( 5 );
if( hb_gt_wvw_GetMainCoordMode() )
{
hb_wvw_HBFUNCPrologue( usWinNum, &usTop, &usLeft, &usBottom, &usRight );
}
xy = hb_gt_wvwGetXYFromColRow( pWindowData, usLeft, usTop );
iTop = xy.y + hb_parvni( 6, 1 );
@@ -338,13 +331,9 @@ HB_FUNC( WVW_DRAWSCROLLBUTTON )
iHeight = iBottom - iTop + 1;
if( bDepressed )
{
hb_gt_wvwDrawBoxRecessed( usWinNum, iTop + 1, iLeft + 1, iBottom - 2, iRight - 2, FALSE );
}
else
{
hb_gt_wvwDrawBoxRaised( usWinNum, iTop + 1, iLeft + 1, iBottom - 2, iRight - 2, FALSE );
}
SelectObject( pWindowData->hdc, s_sApp->solidBrush );
switch( hb_parni( 7 ) )
@@ -527,9 +516,7 @@ HB_FUNC( WVW_DRAWSHADEDRECT )
usRight = ( USHORT ) hb_parni( 5 );
if( hb_gt_wvw_GetMainCoordMode() )
{
hb_wvw_HBFUNCPrologue( usWinNum, &usTop, &usLeft, &usBottom, &usRight );
}
if( s_sApp->hMSImg32 )
{
@@ -601,9 +588,7 @@ HB_FUNC( WVW_DRAWTEXTBOX )
usRight = ( USHORT ) hb_parni( 5 );
if( hb_gt_wvw_GetMainCoordMode() )
{
hb_wvw_HBFUNCPrologue( usWinNum, &usTop, &usLeft, &usBottom, &usRight );
}
xy = hb_gt_wvwGetXYFromColRow( pWindowData, usLeft, usTop );
iTop = xy.y + hb_parvni( 6, 1 );
@@ -678,9 +663,7 @@ HB_FUNC( WVW_DRAWPROGRESSBAR )
POINT xy = { 0 };
if( hb_gt_wvw_GetMainCoordMode() )
{
hb_wvw_HBFUNCPrologue( usWinNum, &usTop, &usLeft, &usBottom, &usRight );
}
xy = hb_gt_wvwGetXYFromColRow( pWindowData, usLeft, usTop );
iTop = xy.y + hb_parvni( 6, 1 );
@@ -738,10 +721,8 @@ HB_FUNC( WVW_DRAWPROGRESSBAR )
}
if( bImage )
{
hb_gt_wvwDrawImage( usWinNum, rc.left, rc.top, rc.right - rc.left + 1, rc.bottom - rc.top + 1, hb_parc( 10 ),
FALSE );
}
else
{
@@ -796,9 +777,7 @@ HB_FUNC( WVW_DRAWBOXGET )
iOffRight = ! HB_ISNIL( 5 ) ? hb_parvni( 5, 4 ) : 0;
if( hb_gt_wvw_GetMainCoordMode() )
{
hb_wvw_HBFUNCPrologue( usWinNum, &usRow, &usCol, NULL, NULL );
}
xy = hb_gt_wvwGetXYFromColRow( pWindowData, usCol, usRow );
iTop = xy.y - 1 + iOffTop;
@@ -882,9 +861,7 @@ HB_FUNC( WVW_DRAWBOXGET_XP )
iOffRight = ! HB_ISNIL( 5 ) ? hb_parvni( 5, 4 ) : 0;
if( hb_gt_wvw_GetMainCoordMode() )
{
hb_wvw_HBFUNCPrologue( usWinNum, &usRow, &usCol, NULL, NULL );
}
xy = hb_gt_wvwGetXYFromColRow( pWindowData, usCol, usRow );
iTop = xy.y - 1 + iOffTop;
@@ -915,7 +892,6 @@ HB_FUNC( WVW_DRAWBOXGET_XP )
}
/* */
/* Wvw_DrawBoxRaised( nWinNum, */
/* nTop, nLeft, nBottom, nRight, */
@@ -949,9 +925,7 @@ HB_FUNC( WVW_DRAWBOXRAISED )
pWindowData = hb_gt_wvw_GetWindowsData( usWinNum );
if( hb_gt_wvw_GetMainCoordMode() )
{
hb_wvw_HBFUNCPrologue( usWinNum, &usTop, &usLeft, &usBottom, &usRight );
}
if( bTight )
{
@@ -1028,9 +1002,7 @@ HB_FUNC( WVW_DRAWBOXRECESSED )
pWindowData = hb_gt_wvw_GetWindowsData( usWinNum );
if( hb_gt_wvw_GetMainCoordMode() )
{
hb_wvw_HBFUNCPrologue( usWinNum, &usTop, &usLeft, &usBottom, &usRight );
}
if( bTight )
{
@@ -1104,9 +1076,7 @@ HB_FUNC( WVW_DRAWBOXGROUP )
iOffRight = ! HB_ISNIL( 6 ) ? hb_parvni( 6, 4 ) : 0;
if( hb_gt_wvw_GetMainCoordMode() )
{
hb_wvw_HBFUNCPrologue( usWinNum, &usTop, &usLeft, &usBottom, &usRight );
}
xy = hb_gt_wvwGetXYFromColRow( pWindowData, usLeft, usTop );
iTop = xy.y - 1 + iOffTop;
@@ -1171,9 +1141,7 @@ HB_FUNC( WVW_DRAWBOXGROUPRAISED )
pWindowData = hb_gt_wvw_GetWindowsData( usWinNum );
if( hb_gt_wvw_GetMainCoordMode() )
{
hb_wvw_HBFUNCPrologue( usWinNum, &usTop, &usLeft, &usBottom, &usRight );
}
xy = hb_gt_wvwGetXYFromColRow( pWindowData, usLeft, usTop );
iTop = xy.y - 1;
@@ -1265,9 +1233,7 @@ HB_FUNC( WVW_DRAWIMAGE )
pWindowData = hb_gt_wvw_GetWindowsData( usWinNum );
if( hb_gt_wvw_GetMainCoordMode() )
{
hb_wvw_HBFUNCPrologue( usWinNum, &usTop, &usLeft, &usBottom, &usRight );
}
if( bTight )
{
@@ -1284,9 +1250,7 @@ HB_FUNC( WVW_DRAWIMAGE )
iORight = hb_parvni( 7, 4 );
}
else
{
iOTop = iOLeft = iOBottom = iORight = 0;
}
xy = hb_gt_wvwGetXYFromColRow( pWindowData, usLeft, usTop );
iTop = xy.y + iOTop;
@@ -1304,14 +1268,10 @@ HB_FUNC( WVW_DRAWIMAGE )
bActRight = FALSE;
bActBottom = FALSE;
}
else
else if( bActRight && bActBottom )
{
if( bActRight && bActBottom )
{
iRight = iLeft + iImgWidth - 1;
iBottom = iTop + iImgHeight - 1;
}
iRight = iLeft + iImgWidth - 1;
iBottom = iTop + iImgHeight - 1;
}
}
@@ -1320,16 +1280,10 @@ HB_FUNC( WVW_DRAWIMAGE )
xy.y -= pWindowData->byLineSpacing;
if( ! bActBottom )
{
iBottom = xy.y - 1 + iOBottom;
}
if( ! bActRight )
{
iRight = xy.x - 1 + iORight;
}
if( ( bActBottom || bActRight ) && ! ( bActBottom && bActRight ) )
{
@@ -1353,17 +1307,11 @@ HB_FUNC( WVW_DRAWIMAGE )
}
if( HB_ISNUM( 6 ) )
{
bResult = hb_gt_wvwRenderPicture( usWinNum, iLeft, iTop, ( iRight - iLeft ) + 1, ( iBottom - iTop ) + 1, s_sApp->iPicture[ hb_parni( 6 ) - 1 ],
bTransparent );
}
else
{
bResult = hb_gt_wvwDrawImage( usWinNum, iLeft, iTop, ( iRight - iLeft ) + 1, ( iBottom - iTop ) + 1, hb_parcx( 6 ),
bTransparent );
}
hb_retl( bResult );
}
@@ -1415,9 +1363,7 @@ HB_FUNC( WVW_DRAWIMAGE_RESOURCE )
pWindowData = hb_gt_wvw_GetWindowsData( usWinNum );
if( hb_gt_wvw_GetMainCoordMode() )
{
hb_wvw_HBFUNCPrologue( usWinNum, &usTop, &usLeft, &usBottom, &usRight );
}
if( bTight )
{
@@ -1434,9 +1380,7 @@ HB_FUNC( WVW_DRAWIMAGE_RESOURCE )
iORight = hb_parvni( 7, 4 );
}
else
{
iOTop = iOLeft = iOBottom = iORight = 0;
}
xy = hb_gt_wvwGetXYFromColRow( pWindowData, usLeft, usTop );
iTop = xy.y + iOTop;
@@ -1454,11 +1398,9 @@ HB_FUNC( WVW_DRAWIMAGE_RESOURCE )
pPic = rr_LoadPicture( hb_parcx( 6 ), &lImgWidth, &lImgHeight );
}
else
{
pPic = rr_LoadPictureFromResource( NULL, hb_parni( 6 ), &lImgWidth, &lImgHeight );
}
// lImgWidth = iImgWidth;
// lImgWidth = iImgWidth;
// lImgHeight = iImgHeight;
if( pPic == NULL )
@@ -1472,14 +1414,10 @@ HB_FUNC( WVW_DRAWIMAGE_RESOURCE )
bActRight = FALSE;
bActBottom = FALSE;
}
else
else if( bActRight && bActBottom )
{
if( bActRight && bActBottom )
{
iRight = iLeft + iImgWidth;
iBottom = iTop + iImgHeight;
}
iRight = iLeft + iImgWidth;
iBottom = iTop + iImgHeight;
}
}
@@ -1488,16 +1426,10 @@ HB_FUNC( WVW_DRAWIMAGE_RESOURCE )
xy.y -= pWindowData->byLineSpacing;
if( ! bActBottom )
{
iBottom = xy.y - 1 + iOBottom;
}
if( ! bActRight )
{
iRight = xy.x - 1 + iORight;
}
if( ( bActBottom || bActRight ) && ! ( bActBottom && bActRight ) )
{
@@ -1549,9 +1481,7 @@ HB_FUNC( WVW_DRAWLABEL )
pWindowData = hb_gt_wvw_GetWindowsData( usWinNum );
if( hb_gt_wvw_GetMainCoordMode() )
{
hb_wvw_HBFUNCPrologue( usWinNum, &usRow, &usCol, NULL, NULL );
}
logfont.lfEscapement = ( HB_ISNIL( 6 ) ? 0 : ( hb_parni( 6 ) * 10 ) );
logfont.lfOrientation = 0;
@@ -1617,9 +1547,7 @@ HB_FUNC( WVW_DRAWOUTLINE )
pWindowData = hb_gt_wvw_GetWindowsData( usWinNum );
if( hb_gt_wvw_GetMainCoordMode() )
{
hb_wvw_HBFUNCPrologue( usWinNum, &usTop, &usLeft, &usBottom, &usRight );
}
xy = hb_gt_wvwGetXYFromColRow( pWindowData, usLeft, usTop );
iTop = xy.y - 1;
@@ -1637,15 +1565,11 @@ HB_FUNC( WVW_DRAWOUTLINE )
hPen = CreatePen( hb_parni( 6 ), 0, ( HB_ISNIL( 8 ) ? 0 : ( COLORREF ) hb_parnl( 8 ) ) );
if( hPen )
{
hOldPen = ( HPEN ) SelectObject( pWindowData->hdc, hPen );
}
}
else
{
//hPen = 0;
SelectObject( pWindowData->hdc, s_sApp->penBlack );
}
hb_gt_wvwDrawOutline( usWinNum, iTop, iLeft, iBottom, iRight );
@@ -1693,9 +1617,7 @@ HB_FUNC( WVW_DRAWLINE )
iOffRight = ! HB_ISNIL( 12 ) ? hb_parvni( 12, 4 ) : 0;
if( hb_gt_wvw_GetMainCoordMode() )
{
hb_wvw_HBFUNCPrologue( usWinNum, &usTop, &usLeft, &usBottom, &usRight );
}
xy = hb_gt_wvwGetXYFromColRow( pWindowData, usLeft, usTop );
iTop = xy.y + iOffTop;
@@ -1738,13 +1660,9 @@ HB_FUNC( WVW_DRAWLINE )
case 2: /* bottom */
if( iFormat == 0 || iFormat == 1 )
{
y = iBottom - 1;
}
else
{
y = iBottom;
}
break;
case 3: /* Left */
@@ -1752,13 +1670,9 @@ HB_FUNC( WVW_DRAWLINE )
case 4: /* Right */
if( iFormat == 0 || iFormat == 1 )
{
x = iRight - 1;
}
else
{
x = iRight;
}
break;
}
@@ -1856,9 +1770,7 @@ HB_FUNC( WVW_DRAWELLIPSE )
iOffRight = ! HB_ISNIL( 6 ) ? hb_parvni( 6, 4 ) : 0;
if( hb_gt_wvw_GetMainCoordMode() )
{
hb_wvw_HBFUNCPrologue( usWinNum, &usTop, &usLeft, &usBottom, &usRight );
}
xy = hb_gt_wvwGetXYFromColRow( pWindowData, usLeft, usTop );
iTop = xy.y + iOffTop;
@@ -1904,9 +1816,7 @@ HB_FUNC( WVW_DRAWRECTANGLE )
iOffRight = ! HB_ISNIL( 6 ) ? hb_parvni( 6, 4 ) : 0;
if( hb_gt_wvw_GetMainCoordMode() )
{
hb_wvw_HBFUNCPrologue( usWinNum, &usTop, &usLeft, &usBottom, &usRight );
}
xy = hb_gt_wvwGetXYFromColRow( pWindowData, usLeft, usTop );
iTop = xy.y + iOffTop;
@@ -1922,13 +1832,9 @@ HB_FUNC( WVW_DRAWRECTANGLE )
SelectObject( pWindowData->hdc, s_sApp->currentBrush );
// Ref.: 28454 - Marson de Paula - 11/27/2007
if( bUsaCurrentPen )
{
SelectObject( pWindowData->hdc, s_sApp->currentPen );
}
else
{
SelectObject( pWindowData->hdc, s_sApp->penBlack );
}
hb_retl( Rectangle( pWindowData->hdc, iLeft, iTop, iRight, iBottom ) );
}
@@ -1963,9 +1869,7 @@ HB_FUNC( WVW_DRAWROUNDRECT )
iOffRight = ! HB_ISNIL( 6 ) ? hb_parvni( 6, 4 ) : 0;
if( hb_gt_wvw_GetMainCoordMode() )
{
hb_wvw_HBFUNCPrologue( usWinNum, &usTop, &usLeft, &usBottom, &usRight );
}
xy = hb_gt_wvwGetXYFromColRow( pWindowData, usLeft, usTop );
iTop = xy.y + iOffTop;
@@ -2011,9 +1915,7 @@ HB_FUNC( WVW_DRAWFOCUSRECT )
iOffRight = ! HB_ISNIL( 6 ) ? hb_parvni( 6, 4 ) : 0;
if( hb_gt_wvw_GetMainCoordMode() )
{
hb_wvw_HBFUNCPrologue( usWinNum, &usTop, &usLeft, &usBottom, &usRight );
}
xy = hb_gt_wvwGetXYFromColRow( pWindowData, usLeft, usTop );
rc.top = xy.y + iOffTop;
@@ -2057,9 +1959,7 @@ HB_FUNC( WVW_DRAWCOLORRECT )
iOffRight = ! HB_ISNIL( 6 ) ? hb_parvni( 6, 4 ) : 0;
if( hb_gt_wvw_GetMainCoordMode() )
{
hb_wvw_HBFUNCPrologue( usWinNum, &usTop, &usLeft, &usBottom, &usRight );
}
xy = hb_gt_wvwGetXYFromColRow( pWindowData, usLeft, usTop );
rc.top = xy.y + iOffTop;
@@ -2107,17 +2007,13 @@ HB_FUNC( WVW_DRAWGRIDHORZ )
usRight = ( USHORT ) hb_parni( 4 );
if( hb_gt_wvw_GetMainCoordMode() )
{
hb_wvw_HBFUNCPrologue( usWinNum, &usAtRow, &usLeft, NULL, &usRight );
}
iLeft = ( usLeft * pWindowData->PTEXTSIZE.x );
iRight = ( ( ( usRight + 1 ) * pWindowData->PTEXTSIZE.x ) - 1 );
if( s_sApp->gridPen == NULL )
{
s_sApp->gridPen = CreatePen( 0, 0, GetSysColor( COLOR_BTNFACE ) );
}
SelectObject( pWindowData->hdc, s_sApp->gridPen );
@@ -2162,9 +2058,7 @@ HB_FUNC( WVW_DRAWGRIDVERT )
pWindowData = hb_gt_wvw_GetWindowsData( usWinNum );
if( ! iTabs )
{
hb_retl( FALSE );
}
iOffTop = ! HB_ISNIL( 6 ) ? hb_parvni( 6, 1 ) : 0;
iOffLeft = ! HB_ISNIL( 6 ) ? hb_parvni( 6, 2 ) : 0;
@@ -2176,9 +2070,7 @@ HB_FUNC( WVW_DRAWGRIDVERT )
usTop = ( USHORT ) hb_parni( 2 );
usBottom = ( USHORT ) hb_parni( 3 );
if( hb_gt_wvw_GetMainCoordMode() )
{
hb_wvw_HBFUNCPrologue( usWinNum, &usTop, NULL, &usBottom, NULL );
}
iCharWidth = pWindowData->PTEXTSIZE.x;
@@ -2188,9 +2080,7 @@ HB_FUNC( WVW_DRAWGRIDVERT )
iBottom = ( ( usBottom + 1 ) * iCharHeight ) - 1 + pWindowData->usTBHeight + iOffBottom;
if( s_sApp->gridPen == NULL )
{
s_sApp->gridPen = CreatePen( 0, 0, GetSysColor( COLOR_BTNFACE ) );
}
SelectObject( pWindowData->hdc, s_sApp->gridPen );
@@ -2198,9 +2088,7 @@ HB_FUNC( WVW_DRAWGRIDVERT )
{
usCol = ( USHORT ) hb_parvni( 4, i );
if( hb_gt_wvw_GetMainCoordMode() )
{
usCol -= pWindowData->usColOfs;
}
x = ( usCol * iCharWidth ) + iOffLeft;
@@ -2251,9 +2139,7 @@ HB_FUNC( WVW_DRAWBUTTON )
pWindowData = hb_gt_wvw_GetWindowsData( usWinNum );
if( hb_gt_wvw_GetMainCoordMode() )
{
hb_wvw_HBFUNCPrologue( usWinNum, &usTop, &usLeft, &usBottom, &usRight );
}
xy = hb_gt_wvwGetXYFromColRow( pWindowData, usLeft, usTop );
iTop = xy.y;
@@ -2314,14 +2200,9 @@ HB_FUNC( WVW_DRAWBUTTON )
xy.x = iLeft + ( ( iRight - iLeft + 1 ) / 2 );
if( bImage )
{
xy.y = ( iBottom - 2 - iTextHeight );
}
else
{
xy.y = iTop + ( ( iBottom - iTop + 1 - iTextHeight ) / 2 );
}
if( iFormat == 1 )
{
@@ -2342,9 +2223,7 @@ HB_FUNC( WVW_DRAWBUTTON )
SetTextAlign( pWindowData->hdc, oldTextAlign );
}
else
{
iTextHeight = -1;
}
if( bImage )
{
@@ -2360,18 +2239,14 @@ HB_FUNC( WVW_DRAWBUTTON )
FALSE );
}
else
{
hb_gt_wvwDrawImage( usWinNum, iLeft + 4, iTop + 4, iImageWidth, iImageHeight, hb_parcx( 7 ),
FALSE );
}
}
hb_retl( TRUE );
}
/* WVW_DrawStatusbar() is meant for WVT compatibility only.
WVW_SBxxxx() functions are recommended instead.
*/
@@ -2400,9 +2275,7 @@ HB_FUNC( WVW_DRAWSTATUSBAR )
usRight = ( USHORT ) hb_parvni( 3, iNext + 4 );
if( hb_gt_wvw_GetMainCoordMode() )
{
hb_wvw_HBFUNCPrologue( usWinNum, &usTop, &usLeft, &usBottom, &usRight );
}
xy = hb_gt_wvwGetXYFromColRow( pWindowData, usLeft, usTop );
iTop = xy.y;
@@ -2438,9 +2311,7 @@ HB_FUNC( WVW_DRAWSTATUSBAR )
usLeft = ( USHORT ) hb_parvni( 3, 4 * iPanels );
if( hb_gt_wvw_GetMainCoordMode() )
{
hb_wvw_HBFUNCPrologue( usWinNum, &usTop, &usLeft, NULL, NULL );
}
xy = hb_gt_wvwGetXYFromColRow( pWindowData, usLeft, usTop + 1 );
@@ -2496,9 +2367,7 @@ HB_FUNC( WVW_DRAWPICTURE )
int iOLeft, iOTop, iORight, iOBottom;
if( hb_gt_wvw_GetMainCoordMode() )
{
hb_wvw_HBFUNCPrologue( usWinNum, &usTop, &usLeft, &usBottom, &usRight );
}
if( bTight )
{
@@ -2515,12 +2384,9 @@ HB_FUNC( WVW_DRAWPICTURE )
iORight = hb_parvni( 7, 4 );
}
else
{
iOTop = iOLeft = iOBottom = iORight = 0;
}
if( iSlot < WVW_PICTURES_MAX )
{
if( s_sApp->iPicture[ iSlot ] )
{
xy = hb_gt_wvwGetXYFromColRow( pWindowData, usLeft, usTop );
@@ -2536,7 +2402,6 @@ HB_FUNC( WVW_DRAWPICTURE )
);
}
}
}
@@ -2560,9 +2425,7 @@ HB_FUNC( WVW_DRAWLABELEX )
usLeft = ( USHORT ) hb_parni( 3 );
if( hb_gt_wvw_GetMainCoordMode() )
{
hb_wvw_HBFUNCPrologue( usWinNum, &usTop, &usLeft, NULL, NULL );
}
if( s_sApp->hUserFonts[ iSlot ] )
{
@@ -2610,9 +2473,7 @@ HB_FUNC( WVW_DRAWLINEEX )
usRight = ( USHORT ) hb_parni( 5 );
if( hb_gt_wvw_GetMainCoordMode() )
{
hb_wvw_HBFUNCPrologue( usWinNum, &usTop, &usLeft, &usBottom, &usRight );
}
xy = hb_gt_wvwGetXYFromColRow( pWindowData, usLeft, usTop );
iTop = xy.y;
@@ -2647,29 +2508,21 @@ HB_FUNC( WVW_DRAWLINEEX )
case 1: /* Top */
break;
case 2: /* bottom */
if( iFormat == 0 || iFormat == 1 ) /* Raised/Recessd */
{
case 2: /* bottom */
if( iFormat == 0 || iFormat == 1 ) /* Raised/Recessd */
y = iBottom - 1;
}
else
{
y = iBottom;
}
break;
case 3: /* Left */
break;
case 4: /* Right */
if( iFormat == 0 || iFormat == 1 ) /* Raised/Recessd */
{
case 4: /* Right */
if( iFormat == 0 || iFormat == 1 ) /* Raised/Recessd */
x = iRight - 1;
}
else
{
x = iRight;
}
break;
}
@@ -2759,9 +2612,7 @@ HB_FUNC( WVW_DRAWOUTLINEEX )
usRight = ( USHORT ) hb_parni( 5 );
if( hb_gt_wvw_GetMainCoordMode() )
{
hb_wvw_HBFUNCPrologue( usWinNum, &usTop, &usLeft, &usBottom, &usRight );
}
xy = hb_gt_wvwGetXYFromColRow( pWindowData, usLeft, usTop );
iTop = xy.y - 1;
@@ -2772,13 +2623,9 @@ HB_FUNC( WVW_DRAWOUTLINEEX )
iRight = xy.x;
if( s_sApp->hUserPens[ iSlot ] )
{
SelectObject( pWindowData->hdc, s_sApp->hUserPens[ iSlot ] );
}
else
{
SelectObject( pWindowData->hdc, s_sApp->penBlack );
}
hb_gt_wvwDrawOutline( usWinNum, iTop, iLeft, iBottom, iRight );
}

75
harbour/extras/gtwvw/wvwedit.c
View File

@@ -162,9 +162,7 @@ HB_FUNC( WVW_EBCREATE )
iOffRight = ! HB_ISNIL( 12 ) ? hb_parvni( 12, 4 ) : 0;
if( hb_gt_wvw_GetMainCoordMode() )
{
hb_wvw_HBFUNCPrologue( usWinNum, &usTop, &usLeft, &usBottom, &usRight );
}
xy = hb_gt_wvwGetXYFromColRow( pWindowData, usLeft, usTop );
iTop = xy.y + iOffTop;
@@ -179,31 +177,21 @@ HB_FUNC( WVW_EBCREATE )
uiEBid = LastControlId( usWinNum, WVW_CONTROL_EDITBOX );
if( uiEBid == 0 )
{
uiEBid = WVW_ID_BASE_EDITBOX;
}
else
{
uiEBid++;
}
dwStyle = WS_BORDER | WS_GROUP | WS_TABSTOP | dwMoreStyle;
if( ( bEBType & WVW_EB_MULTILINE ) == WVW_EB_MULTILINE )
{
dwStyle |= ES_AUTOVSCROLL | ES_MULTILINE |
ES_WANTRETURN | WS_BORDER | WS_VSCROLL;
}
else
{
dwStyle |= ES_AUTOHSCROLL;
}
if( pWindowData->CodePage == OEM_CHARSET )
{
dwStyle |= ES_OEMCONVERT;
}
hb_winmainArgGet( &hInstance, NULL, NULL );
@@ -245,19 +233,15 @@ HB_FUNC( WVW_EBCREATE )
);
if( bFromOEM )
{
hb_xfree( lpszText );
}
if( usMaxChar > 0 )
{
SendMessage(
( HWND ) hWndEB,
EM_LIMITTEXT,
( WPARAM ) usMaxChar,
( LPARAM ) 0
);
}
rXB.top = usTop; rXB.left = usLeft;
rXB.bottom = usBottom; rXB.right = usRight;
@@ -276,10 +260,7 @@ HB_FUNC( WVW_EBCREATE )
hb_retnl( ( LONG ) uiEBid );
}
else
{
hb_retnl( ( LONG ) 0 );
}
}
/*WVW_EBdestroy( [nWinNum], nEBid )
@@ -296,34 +277,24 @@ HB_FUNC( WVW_EBDESTROY )
while( pcd )
{
if( pcd->byCtrlClass == WVW_CONTROL_EDITBOX && pcd->uiCtrlid == uiEBid )
{
break;
}
pcdPrev = pcd;
pcd = pcd->pNext;
}
if( pcd == NULL )
{
return;
}
DestroyWindow( pcd->hWndCtrl );
if( pcdPrev == NULL )
{
pWindowData->pcdCtrlList = pcd->pNext;
}
else
{
pcdPrev->pNext = pcd->pNext;
}
if( pcd->phiCodeBlock )
{
hb_itemRelease( pcd->phiCodeBlock );
}
hb_xfree( pcd );
}
@@ -339,13 +310,9 @@ HB_FUNC( WVW_EBSETFOCUS )
HWND hWndEB = FindControlHandle( usWinNum, WVW_CONTROL_EDITBOX, uiCtrlId, &bStyle );
if( hWndEB )
{
hb_retl( SetFocus( hWndEB ) != NULL );
}
else
{
hb_retl( FALSE );
}
}
/*WVW_EBisFocused( [nWinNum], nEditId )
@@ -381,14 +348,10 @@ HB_FUNC( WVW_EBENABLE )
hb_retl( EnableWindow( hWndEB, bEnable ) == 0 );
if( ! bEnable )
{
SetFocus( pWindowData->hWnd );
}
}
else
{
hb_retl( FALSE );
}
}
/*WVW_EBeditable( [nWinNum], nEditId, [lEditable] )
@@ -412,19 +375,15 @@ HB_FUNC( WVW_EBEDITABLE )
hb_retl( ! ( ( dwStyle & ES_READONLY ) == ES_READONLY ) );
if( ! HB_ISNIL( 3 ) )
{
SendMessage(
( HWND ) hWndEB,
EM_SETREADONLY,
( WPARAM ) ! bEditable,
( LPARAM ) 0
);
}
}
else
{
hb_retl( FALSE );
}
}
/*WVW_EBsetcodeblock( [nWinNum], nEBid, bBlock )
@@ -452,10 +411,8 @@ HB_FUNC( WVW_EBSETCODEBLOCK )
pcd->bBusy = TRUE;
if( pcd->phiCodeBlock )
{
hb_itemRelease( pcd->phiCodeBlock );
}
pcd->phiCodeBlock = hb_itemNew( phiCodeBlock );
@@ -493,9 +450,7 @@ HB_FUNC( WVW_EBSETFONT )
pData->s_lfEB.lfQuality = HB_ISNIL( 6 ) ? pData->s_lfEB.lfQuality : ( BYTE ) hb_parni( 6 );
pData->s_lfEB.lfPitchAndFamily = FF_DONTCARE;
if( HB_ISCHAR( 2 ) )
{
strcpy( pData->s_lfEB.lfFaceName, hb_parcx( 2 ) );
}
if( pWindowData->hEBfont )
{
@@ -510,10 +465,8 @@ HB_FUNC( WVW_EBSETFONT )
if( ( pcd->byCtrlClass == WVW_CONTROL_EDITBOX ) &&
( ( HFONT ) SendMessage( pcd->hWndCtrl, WM_GETFONT, ( WPARAM ) 0, ( LPARAM ) 0 ) == hOldFont )
)
{
SendMessage( pcd->hWndCtrl, WM_SETFONT, ( WPARAM ) hFont, ( LPARAM ) TRUE );
}
pcd = pcd->pNext;
}
@@ -523,9 +476,7 @@ HB_FUNC( WVW_EBSETFONT )
}
else
{
retval = FALSE;
}
}
hb_retl( retval );
@@ -584,7 +535,6 @@ HB_FUNC( WVW_EBGETTEXT )
}
if( bSoftBreak )
{
SendMessage(
( HWND ) pcd->hWndCtrl,
EM_FMTLINES,
@@ -592,7 +542,6 @@ HB_FUNC( WVW_EBGETTEXT )
( LPARAM ) 0
);
}
usLen = ( USHORT ) SendMessage( ( HWND ) pcd->hWndCtrl, WM_GETTEXTLENGTH, 0, 0 ) + 1;
@@ -614,9 +563,7 @@ HB_FUNC( WVW_EBGETTEXT )
hb_xfree( lpszText );
}
else
{
hb_retc( lpszTextANSI );
}
hb_xfree( lpszTextANSI );
}
@@ -657,9 +604,7 @@ HB_FUNC( WVW_EBSETTEXT )
);
if( bFromOEM )
{
hb_xfree( lpszText );
}
hb_retl( bRetval );
}
@@ -777,7 +722,6 @@ HB_FUNC( WVW_STCREATE )
}
iOffTop = ! HB_ISNIL( 6 ) ? hb_parvni( 6, 1 ) : 0;
iOffLeft = ! HB_ISNIL( 6 ) ? hb_parvni( 6, 2 ) : 0;
@@ -785,9 +729,7 @@ HB_FUNC( WVW_STCREATE )
iOffRight = ! HB_ISNIL( 6 ) ? hb_parvni( 6, 4 ) : 0;
if( hb_gt_wvw_GetMainCoordMode() )
{
hb_wvw_HBFUNCPrologue( usWinNum, &usTop, &usLeft, &usBottom, &usRight );
}
xy = hb_gt_wvwGetXYFromColRow( pWindowData, usLeft, usTop );
iTop = xy.y + iOffTop;
@@ -802,13 +744,9 @@ HB_FUNC( WVW_STCREATE )
uiCBid = LastControlId( usWinNum, WVW_CONTROL_STATIC );
if( uiCBid == 0 )
{
uiCBid = WVW_ID_BASE_STATIC;
}
else
{
uiCBid++;
}
hb_winmainArgGet( &hInstance, NULL, NULL );
@@ -840,9 +778,7 @@ HB_FUNC( WVW_STCREATE )
if( HB_ISCHAR( 5 ) )
{
SendMessage( hWndCB, WM_SETTEXT, 0, ( LPARAM ) hb_parc( 5 ) );
}
if( hFont )
SendMessage( hWndCB, WM_SETFONT, ( WPARAM ) hFont, ( LPARAM ) TRUE );
else
@@ -851,10 +787,7 @@ HB_FUNC( WVW_STCREATE )
HB_STOREHANDLE( hWndCB, 9 );
}
else
{
hb_retnl( ( LONG ) 0 );
}
}
@@ -870,9 +803,7 @@ HB_FUNC( WVW_STSETTEXT )
hb_retl( 1 );
}
else
{
hb_retl( FALSE );
}
}
@@ -896,9 +827,7 @@ HB_FUNC( WVW_STSETFONT )
pData->s_lfST.lfQuality = HB_ISNIL( 6 ) ? pData->s_lfST.lfQuality : ( BYTE ) hb_parni( 6 );
pData->s_lfST.lfPitchAndFamily = FF_DONTCARE;
if( HB_ISCHAR( 2 ) )
{
strcpy( pData->s_lfST.lfFaceName, hb_parcx( 2 ) );
}
if( pWindowData->hSTfont )
{
@@ -913,10 +842,8 @@ HB_FUNC( WVW_STSETFONT )
if( ( pcd->byCtrlClass == WVW_CONTROL_STATIC ) &&
( ( HFONT ) SendMessage( pcd->hWndCtrl, WM_GETFONT, ( WPARAM ) 0, ( LPARAM ) 0 ) == hOldFont )
)
{
SendMessage( pcd->hWndCtrl, WM_SETFONT, ( WPARAM ) hFont, ( LPARAM ) TRUE );
}
pcd = pcd->pNext;
}
@@ -926,9 +853,7 @@ HB_FUNC( WVW_STSETFONT )
}
else
{
retval = FALSE;
}
}
hb_retl( retval );

227
harbour/extras/gtwvw/wvwfuncs.c
View File

@@ -115,7 +115,6 @@ HB_FUNC( WIN_SENDMESSAGE )
}
HB_FUNC( WIN_SENDDLGITEMMESSAGE )
{
char * cText;
@@ -127,9 +126,7 @@ HB_FUNC( WIN_SENDDLGITEMMESSAGE )
hb_xmemcpy( cText, hb_itemGetCPtr( pText ), hb_itemGetCLen( pText ) + 1 );
}
else
{
cText = NULL;
}
hb_retnl( ( LONG ) SendDlgItemMessage( ( HWND ) HB_PARHANDLE( 1 ),
( int ) hb_parni( 2 ),
@@ -140,14 +137,10 @@ HB_FUNC( WIN_SENDDLGITEMMESSAGE )
);
if( pText )
{
hb_storclen( cText, hb_itemGetCLen( pText ), 5 );
}
if( cText )
{
hb_xfree( cText );
}
}
/*
@@ -161,80 +154,66 @@ HB_FUNC( WIN_SETTIMER )
}
HB_FUNC( WIN_SETFOCUS )
{
SetFocus( ( HWND ) HB_PARHANDLE( 1 ) );
}
HB_FUNC( WIN_SETTEXTCOLOR )
{
hb_retnl( ( ULONG ) SetTextColor( ( HDC ) HB_PARHANDLE( 1 ), ( COLORREF ) hb_parnl( 2 ) ) );
}
HB_FUNC( WIN_SETBKCOLOR )
{
hb_retnl( ( ULONG ) SetBkColor( ( HDC ) HB_PARHANDLE( 1 ), ( COLORREF ) hb_parnl( 2 ) ) );
}
HB_FUNC( WVW_SETBKMODE )
{
hb_retni( ( int ) SetBkMode( ( HDC ) HB_PARHANDLE( 1 ), hb_parni( 2 ) ) );
}
HB_FUNC( WIN_GETSTOCKOBJECT )
{
hb_retnl( ( ULONG ) GetStockObject( hb_parnl( 1 ) ) );
}
HB_FUNC( WIN_DELETEOBJECT )
{
hb_retl( DeleteObject( ( HGDIOBJ ) HB_PARHANDLE( 1 ) ) );
}
HB_FUNC( WIN_SELECTOBJECT )
{
hb_retnl( ( ULONG ) SelectObject( ( HDC ) HB_PARHANDLE( 1 ), ( HGDIOBJ ) HB_PARHANDLE( 2 ) ) );
}
HB_FUNC( WIN_MULDIV )
{
hb_retni( MulDiv( hb_parni( 1 ), hb_parni( 2 ), hb_parni( 3 ) ) );
}
HB_FUNC( WIN_GETDIALOGBASEUNITS )
{
hb_retnl( ( LONG ) GetDialogBaseUnits() );
}
HB_FUNC( WIN_SETDLGITEMTEXT )
{
SetDlgItemText( ( HWND ) HB_PARHANDLE( 1 ), hb_parni( 2 ), hb_parc( 3 ) );
}
HB_FUNC( WIN_GETDLGITEMTEXT )
{
USHORT iLen = ( USHORT ) SendMessage( ( HWND ) GetDlgItem( ( HWND ) HB_PARHANDLE( 1 ), hb_parni( 2 ) ), ( UINT ) WM_GETTEXTLENGTH, ( WPARAM ) 0, ( LPARAM ) 0 ) + 1;
@@ -251,7 +230,6 @@ HB_FUNC( WIN_GETDLGITEMTEXT )
}
HB_FUNC( WIN_CHECKDLGBUTTON )
{
hb_retl( CheckDlgButton( ( HWND ) HB_PARHANDLE( 1 ), hb_parni( 2 ),
@@ -259,14 +237,12 @@ HB_FUNC( WIN_CHECKDLGBUTTON )
}
HB_FUNC( WIN_ISDLGBUTTONCHECKED )
{
hb_retni( IsDlgButtonChecked( ( HWND ) HB_PARHANDLE( 1 ), hb_parni( 2 ) ) );
}
HB_FUNC( WIN_CHECKRADIOBUTTON )
{
hb_retl( CheckRadioButton( ( HWND ) HB_PARHANDLE( 1 ),
@@ -277,21 +253,18 @@ HB_FUNC( WIN_CHECKRADIOBUTTON )
}
HB_FUNC( WIN_GETDLGITEM )
{
hb_retnl( ( ULONG ) GetDlgItem( ( HWND ) HB_PARHANDLE( 1 ), hb_parni( 2 ) ) );
}
HB_FUNC( WIN_MESSAGEBOX )
{
hb_retni( MessageBox( ( HWND ) HB_PARHANDLE( 1 ), hb_parcx( 2 ), hb_parcx( 3 ), HB_ISNIL( 4 ) ? MB_OK : hb_parni( 4 ) ) );
}
HB_FUNC( WIN_INVALIDATERECT )
{
InvalidateRect( ( HWND ) HB_PARHANDLE( 1 ), NULL, TRUE );
@@ -307,13 +280,9 @@ HB_FUNC( WIN_LOADICON )
HICON hIcon;
if( HB_ISNUM( 1 ) )
{
hIcon = LoadIcon( hb_getWvwData()->hInstance, MAKEINTRESOURCE( hb_parni( 1 ) ) );
}
else
{
hIcon = ( HICON ) LoadImage( ( HINSTANCE ) NULL, hb_parc( 1 ), IMAGE_ICON, 0, 0, LR_LOADFROMFILE );
}
hb_retnl( ( ULONG ) hIcon );
}
@@ -350,7 +319,6 @@ HB_FUNC( WIN_LOADIMAGE )
}
HB_FUNC( WIN_GETCLIENTRECT )
{
RECT rc = { 0 };
@@ -380,28 +348,24 @@ HB_FUNC( WIN_GETCLIENTRECT )
*/
HB_FUNC( WIN_GETDC )
{
HB_RETHANDLE( GetDC( ( HWND ) HB_PARHANDLE( 1 ) ) );
}
HB_FUNC( WIN_RELEASEDC )
{
hb_retl( ReleaseDC( ( HWND ) HB_PARHANDLE( 1 ), ( HDC ) HB_PARHANDLE( 2 ) ) );
}
HB_FUNC( WVW_RECTANGLE )
{
Rectangle( ( HDC ) HB_PARHANDLE( 1 ), hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) );
}
HB_FUNC( WIN_CREATEBRUSH )
{
LOGBRUSH lb = { 0 };
@@ -512,9 +476,7 @@ HB_FUNC( WVW_SETCONTROLTEXT )
HWND hWndPB = FindControlHandle( usWinNum, WVW_CONTROL_PUSHBUTTON, uiCtrlId, &bStyle );
if( uiCtrlId == 0 || hWndPB == NULL )
{
return;
}
SetWindowText( hWndPB, hb_parcx( 3 ) );
hb_retl( TRUE );
}
@@ -535,13 +497,9 @@ HB_FUNC( WVW_PBVISIBLE )
}
if( bEnable )
{
iCmdShow = SW_SHOW;
}
else
{
iCmdShow = SW_HIDE;
}
hb_retl( ShowWindow( hWndPB, iCmdShow ) == 0 );
}
@@ -557,19 +515,13 @@ HB_FUNC( WVW_CBVISIBLE )
if( hWndCB )
{
if( bEnable )
{
iCmdShow = SW_SHOW;
}
else
{
iCmdShow = SW_HIDE;
}
hb_retl( ShowWindow( hWndCB, iCmdShow ) == 0 );
}
else
{
hb_retl( FALSE );
}
}
HB_FUNC( WVW_CXVISIBLE )
@@ -588,13 +540,9 @@ HB_FUNC( WVW_CXVISIBLE )
}
if( bEnable )
{
iCmdShow = SW_SHOW;
}
else
{
iCmdShow = SW_HIDE;
}
hb_retl( ShowWindow( hWndPB, iCmdShow ) == 0 );
}
@@ -624,36 +572,25 @@ HB_FUNC( WVW_XBVISIBLE )
}
HB_FUNC( WVW_MOUSE_COL )
{
WVW_DATA * pData = hb_getWvwData();
if( hb_gt_wvw_GetMainCoordMode() )
{
hb_retni( hb_gt_wvwGetMouseX( pData->s_pWindows[ pData->s_usNumWindows - 1 ] ) + hb_gt_wvwColOfs( pData->s_usNumWindows - 1 ) );
}
else
{
hb_retni( hb_gt_wvwGetMouseX( pData->s_pWindows[ pData->s_usCurWindow ] ) );
}
}
HB_FUNC( WVW_MOUSE_ROW )
{
WVW_DATA * pData = hb_getWvwData();
if( hb_gt_wvw_GetMainCoordMode() )
{
hb_retni( hb_gt_wvwGetMouseY( pData->s_pWindows[ pData->s_usNumWindows - 1 ] ) + hb_gt_wvwRowOfs( pData->s_usNumWindows - 1 ) );
}
else
{
hb_retni( hb_gt_wvwGetMouseY( pData->s_pWindows[ pData->s_usCurWindow ] ) );
}
}
HB_FUNC( SENDMESSAGE )
@@ -751,9 +688,6 @@ HB_FUNC( ADDTOOLTIPEX ) // changed by MAG
}
/*
* CreateImagelist( array, cx, cy, nGrow, flags )
*/
@@ -1267,9 +1201,7 @@ HB_FUNC( TOOLBARADDBUTTONS )
hb_gt_wvwTBinitSize( pWindowData, hWndCtrl );
if( pWindowData->usTBHeight != usOldHeight )
{
hb_gt_wvwResetWindow( usWinNum );
}
hb_xfree( tb );
}
@@ -1316,9 +1248,7 @@ HB_FUNC( SETBITMAPRESOURCEID )
}
else /* system bitmap */
{
iNewBitmap = ( int ) uiBitmap + iOffset;
}
hb_retni( iNewBitmap );
}
@@ -1349,14 +1279,10 @@ HB_FUNC( DRAWBITMAP )
SelectObject( hDCmem, hBitmap );
GetObject( hBitmap, sizeof( BITMAP ), ( LPVOID ) &bitmap );
if( nWidthDest && ( nWidthDest != bitmap.bmWidth || nHeightDest != bitmap.bmHeight ) )
{
StretchBlt( hDC, hb_parni( 4 ), hb_parni( 5 ), nWidthDest, nHeightDest, hDCmem,
0, 0, bitmap.bmWidth, bitmap.bmHeight, dwraster );
}
else
{
BitBlt( hDC, hb_parni( 4 ), hb_parni( 5 ), bitmap.bmWidth, bitmap.bmHeight, hDCmem, 0, 0, dwraster );
}
DeleteDC( hDCmem );
}
@@ -1385,7 +1311,6 @@ HB_FUNC( WINDOW2BITMAP )
}
/* wvw_SetMaxBMCache([nMax])
Get/Set maximum user-bitmap cache (default is 20, minimum is 1).
Returns old setting of maximum user-bitmap cache.
@@ -1412,9 +1337,7 @@ HB_FUNC( WVW_SETMAXBMCACHE )
UINT uiOldMaxBMcache = p->s_sApp->uiMaxBMcache;
if( ! HB_ISNIL( 1 ) )
{
p->s_sApp->uiMaxBMcache = ( UINT ) hb_parni( 1 );
}
hb_retni( uiOldMaxBMcache );
}
@@ -1430,23 +1353,12 @@ HB_FUNC( WVW_NUMBMCACHE )
}
/* */
/* Miscellaneous xHarbour callable functions */
/* Budyanto Dj. <budyanto@centrin.net.id> */
/* */
/* TIMER */
@@ -1470,9 +1382,7 @@ HB_FUNC( WVW_SETTIMER )
hb_retl( TRUE );
}
else
{
hb_retl( FALSE );
}
}
/*WVW_KillTimer([nWinNum])
@@ -1492,14 +1402,10 @@ HB_FUNC( WVW_KILLTIMER )
hb_retl( TRUE );
}
else
{
hb_retl( FALSE );
}
}
/*WVW_GetPaintRect( nWinNum ) nWinNum is 0 based */
/*returns array of paint pending rect {top, left, bottom, right} */
/*WARNING: */
@@ -1524,7 +1430,6 @@ HB_FUNC( WVW_GETPAINTRECT )
}
HB_FUNC( WVW_SETPOINTER )
{
UINT usWinNum = WVW_WHICH_WINDOW;
@@ -1607,8 +1512,6 @@ HB_FUNC( WVW_SETPOINTER )
}
/* */
/* Wvw_LoadPicture( nSlot, cFilePic ) */
/* */
@@ -1622,9 +1525,7 @@ HB_FUNC( WVW_LOADPICTURE )
if( iPicture )
{
if( p->s_sApp->iPicture[ iSlot ] )
{
hb_gt_wvwDestroyPicture( p->s_sApp->iPicture[ iSlot ] );
}
p->s_sApp->iPicture[ iSlot ] = iPicture;
bResult = TRUE;
@@ -1666,9 +1567,7 @@ HB_FUNC( WVW_LOADFONT )
if( hFont )
{
if( p->s_sApp->hUserFonts[ iSlot ] )
{
DeleteObject( ( HFONT ) p->s_sApp->hUserFonts[ iSlot ] );
}
p->s_sApp->hUserFonts[ iSlot ] = hFont;
}
}
@@ -1694,22 +1593,16 @@ HB_FUNC( WVW_LOADPEN )
if( hPen )
{
if( p->s_sApp->hUserPens[ iSlot ] )
{
DeleteObject( ( HPEN ) p->s_sApp->hUserPens[ iSlot ] );
}
p->s_sApp->hUserPens[ iSlot ] = hPen;
hb_retl( TRUE );
}
else
{
hb_retl( FALSE );
}
}
HB_FUNC( WVW_MESSAGEBOX )
{
UINT usWinNum = WVW_WHICH_WINDOW;
@@ -1719,7 +1612,6 @@ HB_FUNC( WVW_MESSAGEBOX )
}
/* End of Drawing Primitives */
/* */
@@ -1741,9 +1633,7 @@ HB_FUNC( WVW_CHOOSEFONT )
WVW_DATA * p = hb_getWvwData();
if( ! HB_ISNIL( 2 ) )
{
PointSize = -MulDiv( ( LONG ) hb_parnl( 2 ), GetDeviceCaps( p->s_pWindows[ p->s_usNumWindows - 1 ]->hdc, LOGPIXELSY ), 72 );
}
lf.lfHeight = PointSize;
lf.lfWidth = HB_ISNIL( 3 ) ? 0 : hb_parni( 3 );
@@ -1755,9 +1645,7 @@ HB_FUNC( WVW_CHOOSEFONT )
lf.lfQuality = HB_ISNIL( 5 ) ? DEFAULT_QUALITY : ( BYTE ) hb_parni( 5 );
lf.lfPitchAndFamily = FF_DONTCARE;
if( HB_ISCHAR( 1 ) )
{
strcpy( lf.lfFaceName, hb_parcx( 1 ) );
}
cf.lStructSize = sizeof( CHOOSEFONT );
cf.hwndOwner = p->s_pWindows[ p->s_usNumWindows - 1 ]->hWnd;
@@ -1821,10 +1709,7 @@ HB_FUNC( WVW_CHOOSECOLOR )
WVW_DATA * p = hb_getWvwData();
for( i = 0; i < 16; i++ )
{
crCustClr[ i ] = ( HB_ISARRAY( 2 ) ? ( COLORREF ) hb_parvnl( 2, i + 1 ) : GetSysColor( COLOR_BTNFACE ) );
}
cc.lStructSize = sizeof( CHOOSECOLOR );
cc.hwndOwner = p->s_pWindows[ p->s_usNumWindows - 1 ]->hWnd;
@@ -1834,17 +1719,12 @@ HB_FUNC( WVW_CHOOSECOLOR )
cc.Flags = ( WORD ) ( HB_ISNIL( 3 ) ? CC_ANYCOLOR | CC_RGBINIT | CC_FULLOPEN : hb_parnl( 3 ) );
if( ChooseColor( &cc ) )
{
hb_retnl( cc.rgbResult );
}
else
{
hb_retnl( -1 );
}
}
/*WVW_SETMOUSEPOS( nWinNum, nRow, nCol ) nWinNum is 0 based */
/*WHAT'S the difference with GT_FUNC( mouse_SetPos ) ??? */
/*this func is able to position cursor on any window */
@@ -1862,24 +1742,17 @@ HB_FUNC( WVW_SETMOUSEPOS )
usCol = ( USHORT ) hb_parni( 3 );
if( hb_gt_wvw_GetMainCoordMode() )
{
hb_wvw_HBFUNCPrologue( usWinNum, &usRow, &usCol, NULL, NULL );
}
xy = hb_gt_wvwGetXYFromColRow( pWindowData, usCol, usRow );
if( ClientToScreen( pWindowData->hWnd, &xy ) )
{
hb_retl( SetCursorPos( xy.x, xy.y + ( pWindowData->PTEXTSIZE.y / 2 ) ) );
}
else
{
hb_retl( FALSE );
}
}
/*by bdj */
/*none in gtwvt */
/* Wvw_FillRectangle( nWinNum, nTop, nLeft, nBottom, nRight, nRGBcolor/hBrush, */
@@ -1914,9 +1787,7 @@ HB_FUNC( WVW_FILLRECTANGLE )
RECT xyRect = { 0 };
if( hb_gt_wvw_GetMainCoordMode() )
{
hb_wvw_HBFUNCPrologue( usWinNum, &usTop, &usLeft, &usBottom, &usRight );
}
iOffTop = ! HB_ISNIL( 9 ) ? hb_parvni( 9, 1 ) : 0;
iOffLeft = ! HB_ISNIL( 9 ) ? hb_parvni( 9, 2 ) : 0;
@@ -1963,8 +1834,6 @@ HB_FUNC( WVW_FILLRECTANGLE )
}
HB_FUNC( WVW_LBADDSTRING )
{
SendMessage( GetDlgItem( ( HWND ) HB_PARHANDLE( 1 ), hb_parni( 2 ) ), LB_ADDSTRING, 0, ( LPARAM ) ( LPSTR ) hb_parcx( 3 ) );
@@ -1992,13 +1861,9 @@ HB_FUNC( WVW_DLGSETICON )
HICON hIcon;
if( HB_ISNUM( 2 ) )
{
hIcon = LoadIcon( hb_getWvwData()->hInstance, MAKEINTRESOURCE( hb_parni( 2 ) ) );
}
else
{
hIcon = ( HICON ) LoadImage( ( HINSTANCE ) NULL, hb_parc( 2 ), IMAGE_ICON, 0, 0, LR_LOADFROMFILE );
}
if( hIcon )
{
@@ -2007,22 +1872,16 @@ HB_FUNC( WVW_DLGSETICON )
}
if( hIcon )
{
hb_retnl( ( ULONG ) hIcon );
}
}
/* */
/* GUI Drawing Functions */
/* Pritpal Bedi <pritpal@vouchcac.com> */
/* */
/* */
/* Wvw_SetPen( nPenStyle, nWidth, nColor ) */
/* */
@@ -2040,9 +1899,7 @@ HB_FUNC( WVW_SETPEN )
WVW_DATA * p = hb_getWvwData();
if( HB_ISNIL( 1 ) )
{
hb_retl( FALSE );
}
iPenStyle = hb_parni( 1 );
iPenWidth = HB_ISNIL( 2 ) ? 0 : hb_parni( 2 );
@@ -2061,18 +1918,14 @@ HB_FUNC( WVW_SETPEN )
*/
if( p->s_sApp->currentPen )
{
DeleteObject( ( HPEN ) p->s_sApp->currentPen );
}
p->s_sApp->currentPen = hPen;
hb_retl( TRUE );
}
else
{
hb_retl( FALSE );
}
}
@@ -2092,9 +1945,7 @@ HB_FUNC( WVW_SETBRUSH )
WVW_DATA * p = hb_getWvwData();
if( HB_ISNIL( 1 ) )
{
hb_retl( FALSE );
}
lb.lbStyle = hb_parnl( 1 );
lb.lbColor = HB_ISNIL( 2 ) ? RGB( 0, 0, 0 ) : ( COLORREF ) hb_parnl( 2 );
@@ -2122,9 +1973,7 @@ HB_FUNC( WVW_SETBRUSH )
hb_retl( TRUE );
}
else
{
hb_retl( FALSE );
}
}
@@ -2164,9 +2013,7 @@ HB_FUNC( WVW__MAKEDLGTEMPLATE )
p += nchar;
}
else
{
*p++ = 0;
}
if( ( lStyle & DS_SETFONT ) )
{
@@ -2177,7 +2024,6 @@ HB_FUNC( WVW__MAKEDLGTEMPLATE )
nchar = nCopyAnsiToWideChar( p, TEXT( ( char * ) hb_parvcx( 1, 15 ) ) );
p += nchar;
}
;
for( i = 1; i <= nItems; i++ )
{
@@ -2225,7 +2071,6 @@ HB_FUNC( WVW__MAKEDLGTEMPLATE )
*p++ = 0x00;
}
;
p = lpwAlign( p );
@@ -2249,13 +2094,6 @@ HB_FUNC( WVW_GETCURSORPOS )
}
/* WVW_ShowWindow( [nWinNum], nCmdShow ) */
HB_FUNC( WVW_SHOWWINDOW )
{
@@ -2267,7 +2105,6 @@ HB_FUNC( WVW_SHOWWINDOW )
}
/* WVW_UpdateWindow( [nWinNum] ) */
HB_FUNC( WVW_UPDATEWINDOW )
{
@@ -2298,12 +2135,8 @@ HB_FUNC( WVW_CREATEDIALOGDYNAMIC )
/* check if we still have room for a new dialog */
for( iIndex = 0; iIndex < WVW_DLGML_MAX; iIndex++ )
{
if( p->s_sApp->hDlgModeless[ iIndex ] == NULL )
{
break;
}
}
if( iIndex >= WVW_DLGML_MAX )
{
@@ -2323,21 +2156,17 @@ HB_FUNC( WVW_CREATEDIALOGDYNAMIC )
{
pExecSym = hb_dynsymFindName( hb_itemGetCPtr( pFirst ) );
if( pExecSym )
{
pFunc = ( PHB_ITEM ) pExecSym;
}
iType = 1;
}
{
if( HB_ISNUM( 3 ) )
{
hDlg = CreateDialogIndirect( hb_getWvwData()->hInstance,
( LPDLGTEMPLATE ) hb_parc( 1 ),
hb_parl( 2 ) ? p->s_pWindows[ 0 ]->hWnd : NULL,
( DLGPROC ) hb_parnl( 3 ) );
}
else
{
@@ -2374,10 +2203,8 @@ HB_FUNC( WVW_CREATEDIALOGDYNAMIC )
/* if codeblock, store the codeblock and lock it there */
if( HB_IS_BLOCK( pFirst ) )
{
p->s_sApp->pcbFunc[ iIndex ] = pFunc;
}
p->s_sApp->pFunc[ iIndex ] = pFunc;
p->s_sApp->iType[ iIndex ] = iType;
@@ -2393,9 +2220,7 @@ HB_FUNC( WVW_CREATEDIALOGDYNAMIC )
{
if( iType == 2 && pFunc )
{
hb_itemRelease( pFunc );
}
p->s_sApp->hDlgModeless[ iIndex ] = NULL;
}
@@ -2405,7 +2230,6 @@ HB_FUNC( WVW_CREATEDIALOGDYNAMIC )
}
HB_FUNC( WVW_CREATEDIALOGMODAL )
{
PHB_ITEM pFirst = hb_param( 3, HB_IT_ANY );
@@ -2419,12 +2243,8 @@ HB_FUNC( WVW_CREATEDIALOGMODAL )
/* check if we still have room for a new dialog */
for( iIndex = 0; iIndex < WVW_DLGMD_MAX; iIndex++ )
{
if( p->s_sApp->hDlgModal[ iIndex ] == NULL )
{
break;
}
}
if( iIndex >= WVW_DLGMD_MAX )
{
@@ -2447,9 +2267,7 @@ HB_FUNC( WVW_CREATEDIALOGMODAL )
{
pExecSym = hb_dynsymFindName( hb_itemGetCPtr( pFirst ) );
if( pExecSym )
{
pFunc = ( PHB_ITEM ) pExecSym;
}
p->s_sApp->pFuncModal[ iIndex ] = pFunc;
p->s_sApp->iTypeModal[ iIndex ] = 1;
}
@@ -2490,8 +2308,6 @@ HB_FUNC( WVW_DELETEOBJECT )
}
HB_FUNC( WVW_SETONTOP )
{
UINT usWinNum = WVW_WHICH_WINDOW;
@@ -2509,7 +2325,6 @@ HB_FUNC( WVW_SETONTOP )
}
HB_FUNC( WVW_SETASNORMAL )
{
UINT usWinNum = WVW_WHICH_WINDOW;
@@ -2551,9 +2366,7 @@ HB_FUNC( WVW_SAVESCREEN )
usRight = ( USHORT ) hb_parni( 5 );
if( hb_gt_wvw_GetMainCoordMode() )
{
hb_wvw_HBFUNCPrologue( usWinNum, &usTop, &usLeft, &usBottom, &usRight );
}
xy = hb_gt_wvwGetXYFromColRow( pWindowData, usLeft, usTop );
iTop = xy.y;
@@ -2606,9 +2419,7 @@ HB_FUNC( WVW_RESTSCREEN )
usRight = ( USHORT ) hb_parni( 5 );
if( hb_gt_wvw_GetMainCoordMode() )
{
hb_wvw_HBFUNCPrologue( usWinNum, &usTop, &usLeft, &usBottom, &usRight );
}
xy = hb_gt_wvwGetXYFromColRow( pWindowData, usLeft, usTop );
iTop = xy.y;
@@ -2635,35 +2446,27 @@ HB_FUNC( WVW_RESTSCREEN )
0,
0,
SRCCOPY ) )
{
bResult = TRUE;
}
}
else
{
if( StretchBlt( pWindowData->hdc,
iLeft,
iTop,
iWidth,
iHeight,
pWindowData->hCompDC,
0,
0,
hb_parvni( 6, 1 ),
hb_parvni( 6, 2 ),
SRCCOPY ) )
{
bResult = TRUE;
}
}
else if( StretchBlt( pWindowData->hdc,
iLeft,
iTop,
iWidth,
iHeight,
pWindowData->hCompDC,
0,
0,
hb_parvni( 6, 1 ),
hb_parvni( 6, 2 ),
SRCCOPY ) )
bResult = TRUE;
}
SelectObject( pWindowData->hCompDC, hBmp );
if( ! bDoNotDestroyBMP )
{
DeleteObject( ( HBITMAP ) hb_parvnl( 6, 3 ) );
}
hb_retl( bResult );
}
@@ -2702,13 +2505,9 @@ HB_FUNC( WVW_CREATEFONT )
hFont = CreateFontIndirect( &logfont );
if( hFont )
{
hb_retnl( ( ULONG ) hFont );
}
else
{
hb_retnl( 0 );
}
}
HB_FUNC( WVW_GETKEYSTATE )

28
harbour/extras/gtwvw/wvwmenu.c
View File

@@ -78,16 +78,11 @@
#include "hbgtwvw.h"
/* */
/* Peter Rees <peter@rees.co.nz> */
/* */
HB_FUNC( WVW_SETMENU )
{
UINT usWinNum = WVW_WHICH_WINDOW;
@@ -99,7 +94,6 @@ HB_FUNC( WVW_SETMENU )
}
HB_FUNC( WVW_SETPOPUPMENU )
{
UINT usWinNum = WVW_WHICH_WINDOW;
@@ -114,21 +108,18 @@ HB_FUNC( WVW_SETPOPUPMENU )
}
HB_FUNC( WVW_CREATEMENU )
{
HB_RETHANDLE( CreateMenu() );
}
HB_FUNC( WVW_CREATEPOPUPMENU )
{
HB_RETHANDLE( CreatePopupMenu() );
}
/* WVW_APPENDMENU( hMenu, nFlags, nMenuItemId, cCaption ) */
HB_FUNC( WVW_APPENDMENU )
@@ -161,41 +152,33 @@ HB_FUNC( WVW_APPENDMENU )
lpszCaption = ucBuf;
}
else
{
lpszCaption = hb_parcx( 4 );
}
}
else
{
lpszCaption = ( LPCTSTR ) hb_parni( 4 );
}
hb_retl( AppendMenu( ( HMENU ) HB_PARHANDLE( 1 ), ( UINT ) hb_parni( 2 ), ( UINT_PTR ) hb_parni( 3 ), ( LPCTSTR ) lpszCaption ) );
}
HB_FUNC( WVW_DELETEMENU )
{
hb_retl( DeleteMenu( ( HMENU ) HB_PARHANDLE( 1 ), ( UINT ) hb_parni( 2 ), ( UINT ) hb_parni( 3 ) ) );
}
HB_FUNC( WVW_DESTROYMENU )
{
hb_retl( DestroyMenu( ( HMENU ) HB_PARHANDLE( 1 ) ) );
}
HB_FUNC( WVW_ENABLEMENUITEM )
{
hb_retni( EnableMenuItem( ( HMENU ) HB_PARHANDLE( 1 ), ( UINT ) hb_parni( 2 ), ( UINT ) hb_parni( 3 ) ) );
}
HB_FUNC( WVW_GETLASTMENUEVENT )
{
UINT usWinNum = WVW_WHICH_WINDOW;
@@ -204,7 +187,6 @@ HB_FUNC( WVW_GETLASTMENUEVENT )
}
HB_FUNC( WVW_SETLASTMENUEVENT )
{
UINT usWinNum = WVW_WHICH_WINDOW;
@@ -213,16 +195,13 @@ HB_FUNC( WVW_SETLASTMENUEVENT )
}
HB_FUNC( WVW_SETMENUKEYEVENT )
{
UINT usWinNum = WVW_WHICH_WINDOW;
int iEvent = 0;
if( HB_ISNUM( 2 ) )
{
iEvent = hb_parnl( 2 );
}
hb_retni( hb_gt_wvwSetMenuKeyEvent( usWinNum, iEvent ) );
}
@@ -294,18 +273,12 @@ HB_FUNC( WVW_MENUITEM_SETBITMAPS )
}
if( ! HB_ISNIL( 2 ) )
{
SetMenuItemBitmaps( ( HMENU ) HB_PARHANDLE( 1 ), hb_parni( 2 ), MF_BYCOMMAND, ( HBITMAP ) hBitmapUnchecked, ( HBITMAP ) hBitmapChecked );
}
else
{
SetMenuItemBitmaps( ( HMENU ) HB_PARHANDLE( 1 ), hb_parni( 3 ), MF_BYPOSITION, ( HBITMAP ) hBitmapUnchecked, ( HBITMAP ) hBitmapChecked );
}
}
HB_FUNC( WVW_DRAWMENUBAR )
{
UINT usWinNum = WVW_WHICH_WINDOW;
@@ -315,7 +288,6 @@ HB_FUNC( WVW_DRAWMENUBAR )
}
HB_FUNC( WVW_ENDMENU )
{
hb_retl( EndMenu() );

72
harbour/extras/gtwvw/wvwpush.c
View File

@@ -168,34 +168,24 @@ HB_FUNC( WVW_PBDESTROY )
while( pcd )
{
if( pcd->byCtrlClass == WVW_CONTROL_PUSHBUTTON && pcd->uiCtrlid == uiPBid )
{
break;
}
pcdPrev = pcd;
pcd = pcd->pNext;
}
if( pcd == NULL )
{
return;
}
DestroyWindow( pcd->hWndCtrl );
if( pcdPrev == NULL )
{
pWindowData->pcdCtrlList = pcd->pNext;
}
else
{
pcdPrev->pNext = pcd->pNext;
}
if( pcd->phiCodeBlock )
{
hb_itemRelease( pcd->phiCodeBlock );
}
hb_xfree( pcd );
}
@@ -211,14 +201,9 @@ HB_FUNC( WVW_PBSETFOCUS )
HWND hWndPB = FindControlHandle( usWinNum, WVW_CONTROL_PUSHBUTTON, uiCtrlId, &bStyle );
if( hWndPB )
{
hb_retl( SetFocus( hWndPB ) != NULL );
}
else
{
hb_retl( FALSE );
}
}
/*WVW_PBisFocused( [nWinNum], nPBid )
@@ -254,14 +239,10 @@ HB_FUNC( WVW_PBENABLE )
hb_retl( EnableWindow( hWndPB, bEnable ) == 0 );
if( ! bEnable )
{
SetFocus( pWindowData->hWnd );
}
}
else
{
hb_retl( FALSE );
}
}
/*WVW_PBsetcodeblock( [nWinNum], nPBid, bBlock )
@@ -309,10 +290,8 @@ HB_FUNC( WVW_PBSETCODEBLOCK )
pcd->bBusy = TRUE;
if( pcd->phiCodeBlock )
{
hb_itemRelease( pcd->phiCodeBlock );
}
pcd->phiCodeBlock = hb_itemNew( phiCodeBlock );
@@ -344,9 +323,7 @@ HB_FUNC( WVW_PBSETSTYLE )
CONTROL_DATA * pcd = GetControlData( usWinNum, WVW_CONTROL_PUSHBUTTON, NULL, uiPBid );
if( pcd->hWndCtrl )
{
SendMessage( pcd->hWndCtrl, BM_SETSTYLE, ( WPARAM ) ulStyle, ( LPARAM ) TRUE );
}
hb_retl( TRUE );
}
@@ -377,9 +354,7 @@ HB_FUNC( WVW_PBSETFONT )
pData->s_lfPB.lfQuality = HB_ISNIL( 6 ) ? pData->s_lfPB.lfQuality : ( BYTE ) hb_parni( 6 );
pData->s_lfPB.lfPitchAndFamily = FF_DONTCARE;
if( HB_ISCHAR( 2 ) )
{
strcpy( pData->s_lfPB.lfFaceName, hb_parcx( 2 ) );
}
if( pWindowData->hPBfont )
{
@@ -394,9 +369,7 @@ HB_FUNC( WVW_PBSETFONT )
if( ( pcd->byCtrlClass == WVW_CONTROL_PUSHBUTTON ) &&
( ( HFONT ) SendMessage( pcd->hWndCtrl, WM_GETFONT, ( WPARAM ) 0, ( LPARAM ) 0 ) == hOldFont )
)
{
SendMessage( pcd->hWndCtrl, WM_SETFONT, ( WPARAM ) hFont, ( LPARAM ) TRUE );
}
pcd = pcd->pNext;
}
@@ -406,9 +379,7 @@ HB_FUNC( WVW_PBSETFONT )
}
else
{
retval = FALSE;
}
}
hb_retl( retval );
@@ -419,7 +390,6 @@ HB_FUNC( WVW_PBSETFONT )
/* PUSHBUTTON ends */
/* COMBOBOX begins (experimental) */
@@ -517,9 +487,7 @@ HB_FUNC( WVW_CBCREATE )
iOffRight = ! HB_ISNIL( 10 ) ? hb_parvni( 10, 4 ) : 0;
if( hb_gt_wvw_GetMainCoordMode() )
{
hb_wvw_HBFUNCPrologue( usWinNum, &usTop, &usLeft, &usBottom, &usRight );
}
xy = hb_gt_wvwGetXYFromColRow( pWindowData, usLeft, usTop );
iTop = xy.y + iOffTop;
@@ -534,13 +502,9 @@ HB_FUNC( WVW_CBCREATE )
uiCBid = LastControlId( usWinNum, WVW_CONTROL_COMBOBOX );
if( uiCBid == 0 )
{
uiCBid = WVW_ID_BASE_COMBOBOX;
}
else
{
uiCBid++;
}
InitCommonControls();
@@ -586,7 +550,6 @@ HB_FUNC( WVW_CBCREATE )
}
}
else
{
for( i = 1; i <= usNumElement; i++ )
{
if( SendMessage( ( HWND ) hWndCB,
@@ -606,7 +569,6 @@ HB_FUNC( WVW_CBCREATE )
}
}
}
SendMessage(
( HWND ) hWndCB,
@@ -649,10 +611,7 @@ HB_FUNC( WVW_CBCREATE )
hb_retnl( ( LONG ) uiCBid );
}
else
{
hb_retnl( ( LONG ) 0 );
}
}
/*WVW_CBdestroy( [nWinNum], nCBid )
@@ -669,34 +628,24 @@ HB_FUNC( WVW_CBDESTROY )
while( pcd )
{
if( pcd->byCtrlClass == WVW_CONTROL_COMBOBOX && pcd->uiCtrlid == uiCBid )
{
break;
}
pcdPrev = pcd;
pcd = pcd->pNext;
}
if( pcd == NULL )
{
return;
}
DestroyWindow( pcd->hWndCtrl );
if( pcdPrev == NULL )
{
pWindowData->pcdCtrlList = pcd->pNext;
}
else
{
pcdPrev->pNext = pcd->pNext;
}
if( pcd->phiCodeBlock )
{
hb_itemRelease( pcd->phiCodeBlock );
}
hb_xfree( pcd );
}
@@ -712,14 +661,9 @@ HB_FUNC( WVW_CBSETFOCUS )
HWND hWndCB = FindControlHandle( usWinNum, WVW_CONTROL_COMBOBOX, uiCtrlId, &bStyle );
if( hWndCB )
{
hb_retl( SetFocus( hWndCB ) != NULL );
}
else
{
hb_retl( FALSE );
}
}
/*WVW_CBisFocused( [nWinNum], nComboId )
@@ -755,14 +699,10 @@ HB_FUNC( WVW_CBENABLE )
hb_retl( EnableWindow( hWndCB, bEnable ) == 0 );
if( ! bEnable )
{
SetFocus( pWindowData->hWnd );
}
}
else
{
hb_retl( FALSE );
}
}
/*WVW_CBsetcodeblock( [nWinNum], nCBid, bBlock )
@@ -790,10 +730,8 @@ HB_FUNC( WVW_CBSETCODEBLOCK )
pcd->bBusy = TRUE;
if( pcd->phiCodeBlock )
{
hb_itemRelease( pcd->phiCodeBlock );
}
pcd->phiCodeBlock = hb_itemNew( phiCodeBlock );
@@ -832,9 +770,7 @@ HB_FUNC( WVW_CBSETFONT )
pData->s_lfCB.lfQuality = HB_ISNIL( 6 ) ? pData->s_lfCB.lfQuality : ( BYTE ) hb_parni( 6 );
pData->s_lfCB.lfPitchAndFamily = FF_DONTCARE;
if( HB_ISCHAR( 2 ) )
{
strcpy( pData->s_lfCB.lfFaceName, hb_parcx( 2 ) );
}
if( pWindowData->hCBfont )
{
@@ -849,10 +785,8 @@ HB_FUNC( WVW_CBSETFONT )
if( ( pcd->byCtrlClass == WVW_CONTROL_COMBOBOX ) &&
( ( HFONT ) SendMessage( pcd->hWndCtrl, WM_GETFONT, ( WPARAM ) 0, ( LPARAM ) 0 ) == hOldFont )
)
{
SendMessage( pcd->hWndCtrl, WM_SETFONT, ( WPARAM ) hFont, ( LPARAM ) TRUE );
}
pcd = pcd->pNext;
}
@@ -862,9 +796,7 @@ HB_FUNC( WVW_CBSETFONT )
}
else
{
retval = FALSE;
}
}
hb_retl( retval );
@@ -1008,13 +940,9 @@ HB_FUNC( WVW_CBGETCURTEXT )
( WPARAM ) iCurSel,
( LPARAM ) lptstr
) == CB_ERR )
{
hb_retclen( lptstr, 0 );
}
else
{
hb_retc( lptstr );
}
hb_xfree( lptstr );
}

53
harbour/extras/gtwvw/wvwstbar.c
View File

@@ -111,13 +111,9 @@ HB_FUNC( WVW_SBCREATE )
RECT rSB = { 0 };
if( pWindowData->hSBfont == NULL )
{
pWindowData->hSBfont = CreateFontIndirect( &pData->s_lfSB );
}
if( GetClientRect( hWndSB, &rSB ) )
{
pWindowData->usSBHeight = ( USHORT ) rSB.bottom;
}
pWindowData->hStatusBar = hWndSB;
hb_gt_wvwResetWindow( usWinNum );
@@ -202,9 +198,7 @@ HB_FUNC( WVW_SBADDPART )
HFONT hOldFont = ( HFONT ) SelectObject( hDCSB, hFont );
if( GetTextExtentPoint32( hDCSB, hb_parcx( 2 ), hb_parclen( 2 ) + 1, &size ) )
{
usWidth = ( USHORT ) size.cx;
}
SelectObject( hDCSB, hOldFont );
@@ -212,26 +206,17 @@ HB_FUNC( WVW_SBADDPART )
}
if( ! lResetParts )
{
numOfParts = SendMessage( hWndSB, SB_GETPARTS, WVW_MAX_STATUS_PARTS, ( LPARAM ) ( LPINT ) ptArray );
}
else
{
numOfParts = 0;
}
numOfParts++;
GetClientRect( hWndSB, &rSB );
ptArray[ numOfParts - 1 ] = rSB.right;
if( ! lResetParts )
{
for( n = 0; n < numOfParts - 1; n++ )
{
ptArray[ n ] -= ( usWidth + WVW_SPACE_BETWEEN_PARTS );
}
}
SendMessage( hWndSB, SB_SETPARTS, numOfParts, ( LPARAM ) ( LPINT ) ptArray );
@@ -243,22 +228,15 @@ HB_FUNC( WVW_SBADDPART )
hIcon = ( HICON ) LoadImage( 0, hb_parcx( 6 ), IMAGE_ICON, cx, cy, LR_LOADFROMFILE | LR_LOADMAP3DCOLORS | LR_LOADTRANSPARENT | LR_DEFAULTSIZE );
if( hIcon == NULL )
{
hIcon = ( HICON ) LoadImage( GetModuleHandle( NULL ), hb_parcx( 6 ), IMAGE_ICON, cx, cy, LR_DEFAULTCOLOR | LR_DEFAULTSIZE );
}
if( ! ( hIcon == NULL ) )
{
SendMessage( hWndSB, SB_SETICON, ( WPARAM ) numOfParts - 1, ( LPARAM ) hIcon );
}
}
SendMessage( hWndSB, SB_SETTEXT, ( numOfParts - 1 ) | displayFlags, ( LPARAM ) NULL );
if( ! HB_ISNIL( 7 ) )
{
SendMessage( hWndSB, SB_SETTIPTEXT, ( WPARAM ) ( numOfParts - 1 ), ( LPARAM ) hb_parcx( 7 ) );
}
hb_retni( numOfParts );
}
@@ -298,9 +276,7 @@ HB_FUNC( WVW_SBREFRESH )
iDiff = rSB.right - ptArray[ numOfParts - 1 ];
for( n = 0; n <= numOfParts - 1; n++ )
{
ptArray[ n ] += iDiff;
}
SendMessage( hWndSB, SB_SETPARTS, numOfParts, ( LPARAM ) ( LPINT ) ptArray );
@@ -394,9 +370,7 @@ HB_FUNC( WVW_SBSETFONT )
pData->s_lfSB.lfQuality = HB_ISNIL( 6 ) ? pData->s_lfSB.lfQuality : ( BYTE ) hb_parni( 6 );
pData->s_lfSB.lfPitchAndFamily = FF_DONTCARE;
if( HB_ISCHAR( 2 ) )
{
strcpy( pData->s_lfSB.lfFaceName, hb_parcx( 2 ) );
}
if( pWindowData->hSBfont )
{
@@ -408,9 +382,7 @@ HB_FUNC( WVW_SBSETFONT )
DeleteObject( ( HFONT ) hOldFont );
}
else
{
retval = FALSE;
}
}
hb_retl( retval );
@@ -513,9 +485,7 @@ HB_FUNC( WVW_XBCREATE )
}
if( hb_gt_wvw_GetMainCoordMode() )
{
hb_wvw_HBFUNCPrologue( usWinNum, &usTop, &usLeft, &usBottom, &usRight );
}
xy = hb_gt_wvwGetXYFromColRow( pWindowData, usLeft, usTop );
iTop = xy.y + iOffTop;
@@ -538,13 +508,9 @@ HB_FUNC( WVW_XBCREATE )
uiXBid = LastControlId( usWinNum, WVW_CONTROL_SCROLLBAR );
if( uiXBid == 0 )
{
uiXBid = WVW_ID_BASE_SCROLLBAR;
}
else
{
uiXBid++;
}
hWndXB = CreateWindowEx(
0L, /* no extended styles */
@@ -586,10 +552,7 @@ HB_FUNC( WVW_XBCREATE )
hb_retnl( ( LONG ) uiXBid );
}
else
{
hb_retnl( ( LONG ) 0 );
}
}
/*WVW_XBdestroy( [nWinNum], nXBid )
@@ -606,34 +569,24 @@ HB_FUNC( WVW_XBDESTROY )
while( pcd )
{
if( pcd->byCtrlClass == WVW_CONTROL_SCROLLBAR && pcd->uiCtrlid == uiXBid )
{
break;
}
pcdPrev = pcd;
pcd = pcd->pNext;
}
if( pcd == NULL )
{
return;
}
DestroyWindow( pcd->hWndCtrl );
if( pcdPrev == NULL )
{
pWindowData->pcdCtrlList = pcd->pNext;
}
else
{
pcdPrev->pNext = pcd->pNext;
}
if( pcd->phiCodeBlock )
{
hb_itemRelease( pcd->phiCodeBlock );
}
hb_xfree( pcd );
}
@@ -667,17 +620,11 @@ HB_FUNC( WVW_XBUPDATE )
}
if( ! HB_ISNIL( 3 ) )
{
fMask = fMask | SIF_POS;
}
if( ! HB_ISNIL( 4 ) )
{
fMask = fMask | SIF_PAGE;
}
if( ! HB_ISNIL( 5 ) && ! HB_ISNIL( 6 ) )
{
fMask = fMask | SIF_RANGE;
}
si.cbSize = sizeof( si );
si.fMask = fMask;

30
harbour/extras/gtwvw/wvwtbar.c
View File

@@ -290,9 +290,7 @@ HB_FUNC( WVW_TBADDBUTTON )
hb_gt_wvwTBinitSize( pWindowData, hWndTB );
if( pWindowData->usTBHeight != usOldHeight )
{
hb_gt_wvwResetWindow( usWinNum );
}
hb_retl( TRUE );
}
@@ -347,9 +345,7 @@ HB_FUNC( WVW_TBDELBUTTON )
hb_gt_wvwTBinitSize( pWindowData, hWndTB );
if( pWindowData->usTBHeight != usOldHeight )
{
hb_gt_wvwResetWindow( usWinNum );
}
hb_retl( TRUE );
}
@@ -434,9 +430,7 @@ HB_FUNC( WVW_TBENABLEBUTTON )
hb_gt_wvwTBinitSize( pWindowData, hWndTB );
if( pWindowData->usTBHeight != usOldHeight )
{
hb_gt_wvwResetWindow( usWinNum );
}
hb_retl( TRUE );
}
@@ -492,8 +486,6 @@ HB_FUNC( WVW_TBCMD2INDEX )
/* TOOLBAR ends */
#if _WIN32_IE > 0x400
@@ -514,9 +506,7 @@ HB_FUNC( WVW_SETTOOLTIPACTIVE )
{
if( hb_parl( 2 ) && ( pWindowData->hWndTT == NULL ) )
{
hb_gt_wvwCreateToolTipWindow( pWindowData );
}
pWindowData->bToolTipActive = hb_parl( 2 );
}
@@ -543,14 +533,10 @@ HB_FUNC( WVW_SETTOOLTIP )
usRight = hb_parni( 5 );
if( ! pWindowData->bToolTipActive )
{
return;
}
if( hb_getWvwData()->s_bMainCoordMode )
{
hb_wvw_HBFUNCPrologue( usWinNum, &usTop, &usLeft, &usBottom, &usRight );
}
ti.cbSize = sizeof( TOOLINFO );
ti.hwnd = pWindowData->hWnd;
@@ -577,7 +563,6 @@ HB_FUNC( WVW_SETTOOLTIP )
}
HB_FUNC( WVW_SETTOOLTIPTEXT )
{
UINT usWinNum = WVW_WHICH_WINDOW;
@@ -596,7 +581,6 @@ HB_FUNC( WVW_SETTOOLTIPTEXT )
}
HB_FUNC( WVW_SETTOOLTIPMARGIN )
{
UINT usWinNum = WVW_WHICH_WINDOW;
@@ -619,15 +603,12 @@ HB_FUNC( WVW_SETTOOLTIPWIDTH )
int iTipWidth = SendMessage( pWindowData->hWndTT, TTM_GETMAXTIPWIDTH, 0, 0 );
if( HB_ISNUM( 2 ) )
{
SendMessage( pWindowData->hWndTT, TTM_SETMAXTIPWIDTH, 0, ( LPARAM ) ( int ) hb_parni( 2 ) );
}
hb_retni( iTipWidth );
}
HB_FUNC( WVW_SETTOOLTIPBKCOLOR )
{
UINT usWinNum = WVW_WHICH_WINDOW;
@@ -636,14 +617,11 @@ HB_FUNC( WVW_SETTOOLTIPBKCOLOR )
COLORREF cr = SendMessage( pWindowData->hWndTT, TTM_GETTIPBKCOLOR, 0, 0 );
if( HB_ISNUM( 2 ) )
{
SendMessage( pWindowData->hWndTT, TTM_SETTIPBKCOLOR, ( WPARAM ) ( COLORREF ) hb_parnl( 2 ), 0 );
}
hb_retnl( ( COLORREF ) cr );
}
HB_FUNC( WVW_SETTOOLTIPTEXTCOLOR )
{
UINT usWinNum = WVW_WHICH_WINDOW;
@@ -652,14 +630,11 @@ HB_FUNC( WVW_SETTOOLTIPTEXTCOLOR )
COLORREF cr = SendMessage( pWindowData->hWndTT, TTM_GETTIPTEXTCOLOR, 0, 0 );
if( HB_ISNUM( 2 ) )
{
SendMessage( pWindowData->hWndTT, TTM_SETTIPTEXTCOLOR, ( WPARAM ) ( COLORREF ) hb_parnl( 2 ), 0 );
}
hb_retnl( ( COLORREF ) cr );
}
HB_FUNC( WVW_SETTOOLTIPTITLE )
{
UINT usWinNum = WVW_WHICH_WINDOW;
@@ -670,15 +645,12 @@ HB_FUNC( WVW_SETTOOLTIPTITLE )
{
iIcon = HB_ISNIL( 2 ) ? 0 : hb_parni( 2 );
if( iIcon > 3 )
{
iIcon = 0;
}
SendMessage( pWindowData->hWndTT, TTM_SETTITLE, ( WPARAM ) iIcon, ( LPARAM ) hb_parcx( 3 ) );
}
}
HB_FUNC( WVW_GETTOOLTIPWIDTH )
{
UINT usWinNum = WVW_WHICH_WINDOW;
@@ -688,7 +660,6 @@ HB_FUNC( WVW_GETTOOLTIPWIDTH )
}
HB_FUNC( WVW_GETTOOLTIPBKCOLOR )
{
UINT usWinNum = WVW_WHICH_WINDOW;
@@ -698,7 +669,6 @@ HB_FUNC( WVW_GETTOOLTIPBKCOLOR )
}
HB_FUNC( WVW_GETTOOLTIPTEXTCOLOR )
{
UINT usWinNum = WVW_WHICH_WINDOW;