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

2009-06-17 16:33 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)

Browse Source 
* harbour/contrib/gtwvg/wvg3stat.prg
  * harbour/contrib/gtwvg/wvgax.prg
  * harbour/contrib/gtwvg/wvgbitmp.prg
  * harbour/contrib/gtwvg/wvgcheck.prg
  * harbour/contrib/gtwvg/wvgclass.prg
  * harbour/contrib/gtwvg/wvgcrt.prg
  * harbour/contrib/gtwvg/wvgdarea.prg
  * harbour/contrib/gtwvg/wvgdatar.prg
  * harbour/contrib/gtwvg/wvgdlg.prg
  * harbour/contrib/gtwvg/wvglistb.prg
  * harbour/contrib/gtwvg/wvgmenub.prg
  * harbour/contrib/gtwvg/wvgmle.prg
  * harbour/contrib/gtwvg/wvgpaint.prg
  * harbour/contrib/gtwvg/wvgphdlr.prg
  * harbour/contrib/gtwvg/wvgpushb.prg
  * harbour/contrib/gtwvg/wvgradio.prg
  * harbour/contrib/gtwvg/wvgscrlb.prg
  * harbour/contrib/gtwvg/wvgsle.prg
  * harbour/contrib/gtwvg/wvgstatb.prg
  * harbour/contrib/gtwvg/wvgstatc.prg
  * harbour/contrib/gtwvg/wvgsysw.prg
  * harbour/contrib/gtwvg/wvgtabpg.prg
  * harbour/contrib/gtwvg/wvgtoolb.prg
  * harbour/contrib/gtwvg/wvgtreev.prg
  * harbour/contrib/gtwvg/wvgutils.c
  * harbour/contrib/gtwvg/wvgwin.c
  * harbour/contrib/gtwvg/wvgwnd.prg
  * harbour/contrib/gtwvg/tests/demowvg.prg
  * harbour/contrib/gtwvg/tests/demoxbp.prg
    - WIN_* Namespace.
    + WDW_* Namespace.
      First pass isolating WIN_* namespace to WDW_ namespace.
      NOTE: This needs change in your sources if you happen to use
      WIN_*() functions. If not you need not to worry.
This commit is contained in:
Pritpal Bedi
2009-06-18 07:34:30 +00:00
parent f221c5324d
commit 855b6a42c7
30 changed files with 587 additions and 380 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
harbour/ChangeLog
View File

@@ -17,6 +17,42 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-06-18 00:32 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
* harbour/contrib/gtwvg/wvg3stat.prg
* harbour/contrib/gtwvg/wvgax.prg
* harbour/contrib/gtwvg/wvgbitmp.prg
* harbour/contrib/gtwvg/wvgcheck.prg
* harbour/contrib/gtwvg/wvgclass.prg
* harbour/contrib/gtwvg/wvgcrt.prg
* harbour/contrib/gtwvg/wvgdarea.prg
* harbour/contrib/gtwvg/wvgdatar.prg
* harbour/contrib/gtwvg/wvgdlg.prg
* harbour/contrib/gtwvg/wvglistb.prg
* harbour/contrib/gtwvg/wvgmenub.prg
* harbour/contrib/gtwvg/wvgmle.prg
* harbour/contrib/gtwvg/wvgpaint.prg
* harbour/contrib/gtwvg/wvgphdlr.prg
* harbour/contrib/gtwvg/wvgpushb.prg
* harbour/contrib/gtwvg/wvgradio.prg
* harbour/contrib/gtwvg/wvgscrlb.prg
* harbour/contrib/gtwvg/wvgsle.prg
* harbour/contrib/gtwvg/wvgstatb.prg
* harbour/contrib/gtwvg/wvgstatc.prg
* harbour/contrib/gtwvg/wvgsysw.prg
* harbour/contrib/gtwvg/wvgtabpg.prg
* harbour/contrib/gtwvg/wvgtoolb.prg
* harbour/contrib/gtwvg/wvgtreev.prg
* harbour/contrib/gtwvg/wvgutils.c
* harbour/contrib/gtwvg/wvgwin.c
* harbour/contrib/gtwvg/wvgwnd.prg
* harbour/contrib/gtwvg/tests/demowvg.prg
* harbour/contrib/gtwvg/tests/demoxbp.prg
- WIN_* Namespace.
+ WVG_* Namespace.
First pass isolating WIN_* namespace to WVG_ namespace.
NOTE: This needs change in your sources if you happen to use
WIN_*() functions. If not you need not to worry.
2009-06-18 09:20 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbct/Makefile
+ contrib/hbct/dattime4.c

375
harbour/contrib/gtwvg/tests/demowvg.prg
View File

@@ -25,12 +25,12 @@
//-------------------------------------------------------------------//
//-------------------------------------------------------------------//
#include "inkey.ch"
#include "common.ch"
#include "wvtwin.ch"
#include "hbgtinfo.ch"
#include "hbgtwvg.ch"
#include "wvgparts.ch"
#include "inkey.ch"
#include "common.ch"
#include "wvtwin.ch"
#include "hbgtinfo.ch"
#include "hbgtwvg.ch"
#include "wvgparts.ch"
REQUEST DbfCdx
REQUEST DbfNtx
@@ -805,10 +805,29 @@ FUNCTION WvtMyBrowse_X( oCrt )
cFileDbf := "test.dbf"
cFileIndex := "test.z01"
USE ( cFileDbf ) NEW SHARED VIA ( cRDD )
SET EXCLUSIVE OFF
#if 1
USE ( cFileDbf ) NEW EXCLUSIVE VIA ( cRDD ) ALIAS 'TEST'
IF NetErr()
Alert( 'Cannot open in exclusive mode!' )
ELSE
USE
ENDIF
#endif
USE ( cFileDbf ) NEW SHARED VIA ( cRDD ) ALIAS 'TEST'
if NetErr()
return nil
endif
ENDIF
#if 0
do WHILE !dbRelease( 'TEST' )
ENDDO
alert( 'Released' )
RETURN nil
#endif
if fLock()
INDEX ON Test->FIRST TAG "001" TO ( cFileIndex )
INDEX ON Test->LAST TAG "002" TO ( cFileIndex )
@@ -2033,72 +2052,72 @@ Function DynDlgProc_2( hDlg, nMsg, wParam, lParam )
Switch ( nMsg )
case WM_TIMER
Win_SetDlgItemText( hDlg, ID_EDT_TIME, Time() )
WVG_SetDlgItemText( hDlg, ID_EDT_TIME, Time() )
exit
case WM_COMMAND
do case
case wParam == ID_CHK_SATIS
lClicked := ( Win_IsDlgButtonChecked( hDlg,ID_CHK_SATIS ) == 1 )
Win_MessageBox( hDlg, iif( lClicked, "Satisfied", "UnSatisfied" ), "CheckBoxStatus" )
lClicked := ( WVG_IsDlgButtonChecked( hDlg,ID_CHK_SATIS ) == 1 )
WVG_MessageBox( hDlg, iif( lClicked, "Satisfied", "UnSatisfied" ), "CheckBoxStatus" )
case wParam == ID_RDO_XH
Win_MessageBox( hDlg, "(x)Harbour", "Compiler" )
WVG_MessageBox( hDlg, "(x)Harbour", "Compiler" )
case wParam == ID_RDO_CLIP
Win_MessageBox( hDlg, "Clipper", "Compiler" )
WVG_MessageBox( hDlg, "Clipper", "Compiler" )
case wParam == ID_RDO_XBASE
Win_MessageBox( hDlg, "Xbase++", "Compiler" )
WVG_MessageBox( hDlg, "Xbase++", "Compiler" )
case wParam == ID_MNU_FILE
Win_MessageBox( hDlg, "Execute Menu Action!", "File" )
WVG_MessageBox( hDlg, "Execute Menu Action!", "File" )
case wParam == ID_MNU_CONTROL
Win_MessageBox( hDlg, "Controls are from Windows!", "Controls" )
WVG_MessageBox( hDlg, "Controls are from Windows!", "Controls" )
case Win_LoWord( wParam ) == ID_LST_LIST
if Win_HiWord( wParam ) == LBN_SELCHANGE
nIndex := Win_SendMessage( Win_GetDlgItem( hDlg, ID_LST_LIST ), LB_GETCURSEL, 0, 0 )
case WVG_LoWord( wParam ) == ID_LST_LIST
if WVG_HiWord( wParam ) == LBN_SELCHANGE
nIndex := WVG_SendMessage( WVG_GetDlgItem( hDlg, ID_LST_LIST ), LB_GETCURSEL, 0, 0 )
cPrompt := space( 20 )
Win_SendMessage( Win_GetDlgItem( hDlg, ID_LST_LIST ), LB_GETTEXT, nIndex, @cPrompt )
Win_MessageBox( hDlg, cPrompt, "ListBox" )
WVG_SendMessage( WVG_GetDlgItem( hDlg, ID_LST_LIST ), LB_GETTEXT, nIndex, @cPrompt )
WVG_MessageBox( hDlg, cPrompt, "ListBox" )
endif
case Win_LoWord( wParam ) == ID_CMB_COMBO
if Win_HiWord( wParam ) == CBN_SELCHANGE
nIndex := Win_SendMessage( Win_GetDlgItem( hDlg, ID_CMB_COMBO ), CB_GETCURSEL, 0, 0 )
case WVG_LoWord( wParam ) == ID_CMB_COMBO
if WVG_HiWord( wParam ) == CBN_SELCHANGE
nIndex := WVG_SendMessage( WVG_GetDlgItem( hDlg, ID_CMB_COMBO ), CB_GETCURSEL, 0, 0 )
cPrompt := space( 20 )
Win_SendMessage( Win_GetDlgItem( hDlg, ID_CMB_COMBO ), CB_GETLBTEXT, nIndex, @cPrompt )
Win_MessageBox( hDlg, cPrompt, "Combo Box" )
WVG_SendMessage( WVG_GetDlgItem( hDlg, ID_CMB_COMBO ), CB_GETLBTEXT, nIndex, @cPrompt )
WVG_MessageBox( hDlg, cPrompt, "Combo Box" )
endif
endcase
exit
case WM_CTLCOLOREDIT
if ( Win_GetDlgItem( hDlg,ID_MLE ) == lParam )
Win_SetTextColor( wParam, RGB( 0,0,255 ) )
Win_SetBkColor( wParam, RGB( 255,255,200 ) )
if ( WVG_GetDlgItem( hDlg,ID_MLE ) == lParam )
WVG_SetTextColor( wParam, RGB( 0,0,255 ) )
WVG_SetBkColor( wParam, RGB( 255,255,200 ) )
return ( 1 )
elseif ( Win_GetDlgItem( hDlg,ID_EDT_TEXT ) == lParam )
Win_SetTextColor( wParam, RGB( 255,255,255 ) )
Win_SetBkColor( wParam, RGB( 10,200,45 ) )
elseif ( WVG_GetDlgItem( hDlg,ID_EDT_TEXT ) == lParam )
WVG_SetTextColor( wParam, RGB( 255,255,255 ) )
WVG_SetBkColor( wParam, RGB( 10,200,45 ) )
Return ( 1 )
endif
exit
case WM_CTLCOLORSTATIC
if ( Win_GetDlgItem( hDlg,ID_STA_TEXT ) == lParam )
Win_SetTextColor( wParam, RGB( 255,255,255 ) )
if ( WVG_GetDlgItem( hDlg,ID_STA_TEXT ) == lParam )
WVG_SetTextColor( wParam, RGB( 255,255,255 ) )
Return ( 1 )
endif
exit
case WM_INITDIALOG
Win_SetTimer( hDlg, 5001, 1000 ) // 1 sec
WVG_SetTimer( hDlg, 5001, 1000 ) // 1 sec
if empty( t_ahFonts )
if ( hFont := Wvt_CreateFont( "Times New Roman", 18 ) ) != 0
@@ -2107,28 +2126,28 @@ Function DynDlgProc_2( hDlg, nMsg, wParam, lParam )
endif
if len( t_ahFonts ) > 0
Win_SendMessage( Win_GetDlgItem( hDlg, ID_MLE ), WM_SETFONT, t_ahFonts[ 1 ], 0 )
WVG_SendMessage( WVG_GetDlgItem( hDlg, ID_MLE ), WM_SETFONT, t_ahFonts[ 1 ], 0 )
endif
if t_hIcon == nil
t_hIcon := Win_LoadIcon( "vr_1.ico" )
t_hIcon := WVG_LoadIcon( "vr_1.ico" )
endif
if t_hIcon != nil .or. t_hIcon != 0
Win_SendMessage( Win_GetDlgItem( hDlg, ID_ICO_VOUCH ), STM_SETIMAGE, IMAGE_ICON, t_hIcon )
WVG_SendMessage( WVG_GetDlgItem( hDlg, ID_ICO_VOUCH ), STM_SETIMAGE, IMAGE_ICON, t_hIcon )
endif
/*
if t_hImage == nil
t_hImage := Win_LoadImage( "vouch1.bmp", 2 )
t_hImage := WVG_LoadImage( "vouch1.bmp", 2 )
endif
if t_hImage != nil .and. t_hImage != 0
Win_SendMessage( Win_GetDlgItem( hDlg, ID_STA_IMAGE ), STM_SETIMAGE, IMAGE_BITMAP, t_hImage )
WVG_SendMessage( WVG_GetDlgItem( hDlg, ID_STA_IMAGE ), STM_SETIMAGE, IMAGE_BITMAP, t_hImage )
endif
*/
Win_SetDlgItemText( hDlg, ID_MLE , GetEditText() )
Win_CheckDlgButton( hDlg, ID_CHK_SATIS, .t. )
WVG_SetDlgItemText( hDlg, ID_MLE , GetEditText() )
WVG_CheckDlgButton( hDlg, ID_CHK_SATIS, .t. )
Win_CheckRadioButton( hDlg, ID_RDO_XH, ID_RDO_XBASE, ID_RDO_XH )
WVG_CheckRadioButton( hDlg, ID_RDO_XH, ID_RDO_XBASE, ID_RDO_XH )
Wvt_LBAddString( hDlg, ID_LST_LIST, "(x)Harbour" )
Wvt_LBAddString( hDlg, ID_LST_LIST, "Gtwvt" )
@@ -2147,7 +2166,7 @@ Function DynDlgProc_2( hDlg, nMsg, wParam, lParam )
Wvt_CBSetCurSel( hDlg, ID_CMB_COMBO, 1 )
Win_InvalidateRect( hDlg )
WVG_InvalidateRect( hDlg )
exit
@@ -2155,7 +2174,7 @@ Function DynDlgProc_2( hDlg, nMsg, wParam, lParam )
// Do whatevert you want to do with cText
// Each box will retrieve its own text.
//
cText := Win_GetDlgItemText( hDlg, ID_MLE )
cText := WVG_GetDlgItemText( hDlg, ID_MLE )
cText := nil
exit
@@ -2201,15 +2220,15 @@ EXIT PROCEDURE CleanHandles()
LOCAL i
for i := 1 to len( t_ahFonts )
Win_DeleteObject( t_ahFonts[ i ] )
WVG_DeleteObject( t_ahFonts[ i ] )
next
if t_hIcon != nil
Win_DeleteObject( t_hIcon )
WVG_DeleteObject( t_hIcon )
endif
if t_hImage != nil
Win_DeleteObject( t_hImage )
WVG_DeleteObject( t_hImage )
endif
Return
@@ -2264,14 +2283,14 @@ FUNCTION DlgSlideShowProc( hDlg, nMsg, wParam, lParam )
FUNCTION DrawSlide( hDlg, nSlide )
LOCAL hDC, aRect
hDC := Win_GetDC( hDlg )
aRect := Win_GetClientRect( hDlg )
hDC := WVG_GetDC( hDlg )
aRect := WVG_GetClientRect( hDlg )
Win_Rectangle( hDC, aRect[ 1 ]+10, aRect[ 2 ]+10, aRect[ 3 ]-10, aRect[ 4 ]-10 )
Win_DrawImage( hDC, aRect[ 1 ]+10, aRect[ 2 ]+10, aRect[ 3 ] - aRect[ 1 ] -20, ;
WVG_Rectangle( hDC, aRect[ 1 ]+10, aRect[ 2 ]+10, aRect[ 3 ]-10, aRect[ 4 ]-10 )
WVG_DrawImage( hDC, aRect[ 1 ]+10, aRect[ 2 ]+10, aRect[ 3 ] - aRect[ 1 ] -20, ;
aRect[ 4 ] - aRect[ 2 ] - 20, t_aSlides[ nSlide ] )
Win_ReleaseDC( hDlg,hDC )
WVG_ReleaseDC( hDlg,hDC )
Return nil
//----------------------------------------------------------------------//
@@ -2289,7 +2308,7 @@ Static Function MyFunction( nMode )
tone( MUSIC_WAITON[1], 1 )
case nMode == 3
Win_MessageBox( , "Button clicked!" )
WVG_MessageBox( , "Button clicked!" )
case nMode == 101 // Charge
Eval( {|| tone(523,2),tone(698,2),tone(880,2),tone(1046,4),tone(880,2),tone(1046,8) } )
@@ -2424,7 +2443,7 @@ Function ExecuteActiveX( nActiveX, xParam )
//--------------------------- StatusBar ---------------------------\\
oSBar := WvgStatusBar():new( oDA ):create( , , , , , .t. )
oSBar:panelClick := {|oPanel| Win_MessageBox( , oPanel:caption ) }
oSBar:panelClick := {|oPanel| WVG_MessageBox( , oPanel:caption ) }
oPanel := oSBar:getItem( 1 )
oPanel:caption := 'My Root Panel'
oPanel1 := oSBar:addItem()
@@ -2458,7 +2477,7 @@ Function ExecuteActiveX( nActiveX, xParam )
oRadio := WvgRadioButton():new( oStatic2,, { 10,10 }, { 100,15 } )
oRadio:caption := "Com 1"
oRadio:selection := .T.
oRadio:selected := {|m1,m2,obj| m1:=m1, m2:=m2, Win_MessageBox( , obj:caption + IF( obj:selection, '< S >', '< N >' ) ) }
oRadio:selected := {|m1,m2,obj| m1:=m1, m2:=m2, WVG_MessageBox( , obj:caption + IF( obj:selection, '< S >', '< N >' ) ) }
oRadio:create()
oRadio := WvgRadioButton():new( oStatic2,, { 10,35 }, { 100,15 } )
@@ -2468,7 +2487,7 @@ Function ExecuteActiveX( nActiveX, xParam )
oCheck := WvgCheckBox():New( oStatic2, , { 10,70 }, { 100,15 }, , .t. )
oCheck:caption := 'Checkbox A'
oCheck:create()
oCheck:selected := {|m1,m2,o| m1:=m1,m2:=m2, Win_MessageBox( , IF( o:getData(), 'I am selected','I am not selected' ) ) }
oCheck:selected := {|m1,m2,o| m1:=m1,m2:=m2, WVG_MessageBox( , IF( o:getData(), 'I am selected','I am not selected' ) ) }
// Create first 3State button, passing the position to :create()
oXbp := Wvg3State():new( oStatic2 )
@@ -2482,7 +2501,7 @@ Function ExecuteActiveX( nActiveX, xParam )
oXbp:caption := "3 State B"
oXbp:create( oStatic2 )
// Determine current state using :getData()
oXbp:selected := {| m1,m2,oBtn | m1:=m1,m2:=m2, Win_MessageBox( , "3State B", aState[ oBtn:getData()+1 ] ) }
oXbp:selected := {| m1,m2,oBtn | m1:=m1,m2:=m2, WVG_MessageBox( , "3State B", aState[ oBtn:getData()+1 ] ) }
// Create first SLE, specify position using :create()
// On :typeOut set the focus to the second SLE
@@ -2541,7 +2560,7 @@ Function ExecuteActiveX( nActiveX, xParam )
aadd( aParts, 'DataRef' )
aeval( aParts, {|e| oListBox:addItem( e ) } )
oListBox:itemSelected := {|| Win_MessageBox( , oListBox:getCurItem() ) }
oListBox:itemSelected := {|| WVG_MessageBox( , oListBox:getCurItem() ) }
oListBox:setData( 3 )
//--------------------------- PushButton --------------------------\\
@@ -2560,7 +2579,7 @@ Function ExecuteActiveX( nActiveX, xParam )
oTree:create()
oTree:setColorBG( RGB( 120,15,240 ) )
oTree:setColorFG( RGB( 15,240,120 ) )
oTree:itemSelected := {|oItem| IF( oItem <> NIL, Win_MessageBox( , oItem:caption ), NIL ) }
oTree:itemSelected := {|oItem| IF( oItem <> NIL, WVG_MessageBox( , oItem:caption ), NIL ) }
oItem1 := oTree:rootItem:addItem( "First level A" )
@@ -2743,8 +2762,8 @@ STATIC FUNCTION BuildActiveXControl( nActiveX, oDA )
oCom:mapEvent( evBtnUp, {|nBtn| if( nBtn == 2, oCom:oParent:sendMessage( WM_CLOSE,0,0 ), NIL ) } )
case nActiveX == 3
hb_gtInfo( HB_GTI_WINTITLE, 'file://' + hb_DirBase() + 'myharu.pdf' )
oCom:CLSID := 'file://' + hb_DirBase() + 'myharu.pdf'
hb_gtInfo( HB_GTI_WINTITLE, 'file://C:\harbour\contrib\gtwvg\tests\myharu.pdf' )
oCom:CLSID := 'file://C:\harbour\contrib\gtwvg\tests\myharu.pdf'
oCom:mapEvent( 269, {|| QOut( ' E X P L O R E R - 2 6 9' ) } )
case nActiveX == 4
@@ -2774,7 +2793,7 @@ Static Function ExeActiveX( nActiveX, oCom, xParam )
//
if nActiveX == 1
oCom:AddressBar := .t.
hb_gtInfo( HB_GTI_WINTITLE, IIF( empty( xParam ), 'http://www.harbour.vouch.info', xParam ) )
hb_gtInfo( HB_GTI_WINTITLE, IF( empty( xParam ), 'http://www.harbour.vouch.info', xParam ) )
oCom:Navigate( IF( empty( xParam ), 'http://www.harbour.vouch.info', xParam ) )
elseif nActiveX == 4
@@ -2783,7 +2802,7 @@ Static Function ExeActiveX( nActiveX, oCom, xParam )
oCom:Draw2Clipboard()
elseif nActiveX == 5
oCom:loadMultiPage( hb_DirBase() + 'myharu.pdf', 2 )
oCom:loadMultiPage( 'c:\myharu.pdf', 2 )
oCom:addGradientBorder( 10, RGB( 12,20,233 ), RGB( 100,255,20 ), 0 )
oCom:drawText( 10,10,'Vouch' )
//oCom:emboss( 3,0 )
@@ -3058,7 +3077,7 @@ FUNCTION demoxbp()
//--------------------------- StatusBar ---------------------------\\
#if 0
oSBar := WvgStatusBar():new( oCrt ):create( , , , , , .t. )
oSBar:panelClick := {|oPanel| Win_MessageBox( , oPanel:caption ) }
oSBar:panelClick := {|oPanel| WVG_MessageBox( , oPanel:caption ) }
oPanel := oSBar:getItem( 1 )
oPanel:caption := 'My Root Panel'
oPanel1 := oSBar:addItem()
@@ -3098,7 +3117,7 @@ FUNCTION demoxbp()
oRadio := WvgRadioButton():new( oStatic2,, { 10,10 }, { 100,15 } )
oRadio:caption := "Com 1"
oRadio:selection := .T.
oRadio:selected := {|m1,m2,obj| m1:=m1, m2:=m2, Win_MessageBox( , obj:caption + IF( obj:selection, '< S >', '< N >' ) ) }
oRadio:selected := {|m1,m2,obj| m1:=m1, m2:=m2, WVG_MessageBox( , obj:caption + IF( obj:selection, '< S >', '< N >' ) ) }
oRadio:create()
oRadio := WvgRadioButton():new( oStatic2,, { 10,35 }, { 100,15 } )
@@ -3108,7 +3127,7 @@ FUNCTION demoxbp()
oCheck := WvgCheckBox():New( oStatic2, , { 10,70 }, { 100,15 }, , .t. )
oCheck:caption := 'Checkbox A'
oCheck:create()
oCheck:selected := {|m1,m2,o| m1:=m1,m2:=m2, Win_MessageBox( , IF( o:getData(), 'I am selected','I am not selected' ) ) }
oCheck:selected := {|m1,m2,o| m1:=m1,m2:=m2, WVG_MessageBox( , IF( o:getData(), 'I am selected','I am not selected' ) ) }
// Create first 3State button, passing the position to :create()
oXbp := Wvg3State():new()
@@ -3122,7 +3141,7 @@ FUNCTION demoxbp()
oXbp:caption := "3 State B"
oXbp:create( oStatic2 )
// Determine current state using :getData()
oXbp:selected := {| m1,m2,oBtn | m1:=m1,m2:=m2, Win_MessageBox( , "3State B", aState[ oBtn:getData()+1 ] ) }
oXbp:selected := {| m1,m2,oBtn | m1:=m1,m2:=m2, WVG_MessageBox( , "3State B", aState[ oBtn:getData()+1 ] ) }
// Create first SLE, specify position using :create()
// On :typeOut set the focus to the second SLE
@@ -3188,7 +3207,7 @@ FUNCTION demoxbp()
aadd( aParts, 'DataRef' )
aeval( aParts, {|e| oListBox:addItem( e ) } )
oListBox:itemSelected := {|| Win_MessageBox( , oListBox:getCurItem() ) }
oListBox:itemSelected := {|| WVG_MessageBox( , oListBox:getCurItem() ) }
oListBox:setData( 3 ) // show selected 'XbpToolBar'
//--------------------------- PushButton --------------------------\\
@@ -3213,7 +3232,7 @@ FUNCTION demoxbp()
oTree:create()
oTree:setColorBG( RGB( 120,15,240 ) )
oTree:setColorFG( RGB( 15,240,120 ) )
oTree:itemSelected := {|oItem| IF( oItem <> NIL, Win_MessageBox( , oItem:caption ), NIL ) }
oTree:itemSelected := {|oItem| IF( oItem <> NIL, WVG_MessageBox( , oItem:caption ), NIL ) }
oItem1 := oTree:rootItem:addItem( "First level A" )
@@ -3389,15 +3408,15 @@ STATIC FUNCTION ActiveXBuildToolBarXbp( oCrt )
oTBar:create()
oTBar:addItem( "New" , hb_DirBase() + 'v_new.bmp' )
oTBar:addItem( "Select" , hb_DirBase() + 'v_selct1.bmp' )
oTBar:addItem( "New" , 'c:\harbour\contrib\gtwvg\tests\v_new.bmp' )
oTBar:addItem( "Select" , 'c:\harbour\contrib\gtwvg\tests\v_selct1.bmp' )
oTBar:addItem( )
oTBar:addItem( "FontDlg" , hb_DirBase() + 'v_calend.bmp' )
oTBar:addItem( "Tools" , hb_DirBase() + 'v_lock.bmp' )
oTBar:addItem( "Index" , hb_DirBase() + 'v_index.bmp' )
oTBar:addItem( "FontDlg" , 'c:\harbour\contrib\gtwvg\tests\v_calend.bmp' )
oTBar:addItem( "Tools" , 'c:\harbour\contrib\gtwvg\tests\v_lock.bmp' )
oTBar:addItem( "Index" , 'c:\harbour\contrib\gtwvg\tests\v_index.bmp' )
oTBar:addItem( )
oTBar:addItem( "Show" , hb_DirBase() + 'v_clclt.bmp' )
oTBar:addItem( "Hide" , hb_DirBase() + 'v_notes1.bmp' )
oTBar:addItem( "Show" , 'c:\harbour\contrib\gtwvg\tests\v_clclt.bmp' )
oTBar:addItem( "Hide" , 'c:\harbour\contrib\gtwvg\tests\v_notes1.bmp' )
RETURN oTBar
//----------------------------------------------------------------------//
@@ -3416,7 +3435,7 @@ Static Function MyFunctionXbp( nMode )
tone( MUSIC_WAITON[1], 1 )
case nMode == 3
Win_MessageBox( , "Button clicked!" )
WVG_MessageBox( , "Button clicked!" )
case nMode == 101 // Charge
Eval( {|| tone(523,2),tone(698,2),tone(880,2),tone(1046,4),tone(880,2),tone(1046,8) } )
@@ -3448,7 +3467,7 @@ STATIC FUNCTION ExeFontDialog( oCrt )
oFontDlg:familyName := "Courier New"
oFontDlg:strikeout := .T.
oFontDlg:underscore := .f.
//oFontDlg:activateOk := {|| Win_MessageBox( , 'activateOK Event Handelled in Windows!' ) }
//oFontDlg:activateOk := {|| WVG_MessageBox( , 'activateOK Event Handelled in Windows!' ) }
oFontDlg:nominalPointSize := 12
//oFontDlg:size := .f.
@@ -3496,7 +3515,7 @@ FUNCTION demoxbp()
//--------------------------- StatusBar ---------------------------\\
oSBar := WvgStatusBar():new( oCrt ):create( , , , , , .t. )
oSBar:panelClick := {|oPanel| Win_MessageBox( , oPanel:caption ) }
oSBar:panelClick := {|oPanel| WVG_MessageBox( , oPanel:caption ) }
oPanel := oSBar:getItem( 1 )
oPanel:caption := 'My Root Panel'
oPanel1 := oSBar:addItem()
@@ -3545,7 +3564,7 @@ FUNCTION demoxbp()
aadd( aParts, 'DataRef' )
aeval( aParts, {|e| oListBox:addItem( e ) } )
oListBox:itemSelected := {|| Win_MessageBox( , oListBox:getCurItem() ) }
oListBox:itemSelected := {|| WVG_MessageBox( , oListBox:getCurItem() ) }
oListBox:setData( 3 ) // show selected 'XbpToolBar'
//--------------------------- PushButton --------------------------\\
@@ -3565,7 +3584,7 @@ FUNCTION demoxbp()
oTree:create()
oTree:setColorBG( RGB( 120,15,240 ) )
oTree:setColorFG( RGB( 15,240,120 ) )
oTree:itemSelected := {|oItem| IF( oItem <> NIL, Win_MessageBox( , oItem:caption ), NIL ) }
oTree:itemSelected := {|oItem| IF( oItem <> NIL, WVG_MessageBox( , oItem:caption ), NIL ) }
oItem1 := oTree:rootItem:addItem( "First level A" )
@@ -3596,6 +3615,7 @@ FUNCTION demoxbp()
oCom := WvgHTMLViewer():New( oDA, , { 0, 0 }, { 100, 100 }, , .t. )
oCom:beforeNavigate := {|cURL, x, oHTML| x := x, oHTML := oHTML, oPanel:caption := cURL }
oCom:statusTextChange := {|cText| oPanel:caption := cText }
oCom:mapEvent( 112, {|| oPanel:caption := ' E X P L O R E R - 2 6 9' } )
#endif
oCom:create()
oCom:Navigate( 'http://www.harbour.vouch.info' )
@@ -3628,7 +3648,7 @@ FUNCTION demoxbp()
oRadio := WvgRadioButton():new( oStatic2,, { 10,10 }, { 100,15 } )
oRadio:caption := "Com 1"
oRadio:selection := .T.
oRadio:selected := {|m1,m2,obj| m1:=m1, m2:=m2, Win_MessageBox( , obj:caption + IF( obj:selection, '< S >', '< N >' ) ) }
oRadio:selected := {|m1,m2,obj| m1:=m1, m2:=m2, WVG_MessageBox( , obj:caption + IF( obj:selection, '< S >', '< N >' ) ) }
oRadio:create()
oRadio := WvgRadioButton():new( oStatic2,, { 10,35 }, { 100,15 } )
@@ -3638,7 +3658,7 @@ FUNCTION demoxbp()
oCheck := WvgCheckBox():New( oStatic2, , { 10,70 }, { 100,15 }, , .t. )
oCheck:caption := 'Checkbox A'
oCheck:create()
oCheck:selected := {|m1,m2,o| m1:=m1,m2:=m2, Win_MessageBox( , IF( o:getData(), 'I am selected','I am not selected' ) ) }
oCheck:selected := {|m1,m2,o| m1:=m1,m2:=m2, WVG_MessageBox( , IF( o:getData(), 'I am selected','I am not selected' ) ) }
// Create first 3State button, passing the position to :create()
oXbp := Wvg3State():new()
@@ -3652,7 +3672,7 @@ FUNCTION demoxbp()
oXbp:caption := "3 State B"
oXbp:create( oStatic2 )
// Determine current state using :getData()
oXbp:selected := {| m1,m2,oBtn | m1:=m1,m2:=m2, Win_MessageBox( , "3State B", aState[ oBtn:getData()+1 ] ) }
oXbp:selected := {| m1,m2,oBtn | m1:=m1,m2:=m2, WVG_MessageBox( , "3State B", aState[ oBtn:getData()+1 ] ) }
// Create first SLE, specify position using :create()
// On :typeOut set the focus to the second SLE
@@ -3676,7 +3696,7 @@ FUNCTION demoxbp()
oXbp:killInputFocus := { |x,y,oSLE| x:=x,y:=y, oSLE:getData(), oPanel:caption := "cVarB =" + cVarB }
// Read file into LOCAL variable
cText := MemoRead( 'gtwvg.hbc' )
cText := MemoRead( 'gtwvg.hbp' )
// Create MLE, specify position using :create() and
// assign data code block accessing LOCAL variable
oMLE := WvgMLE():new()
@@ -3798,15 +3818,15 @@ STATIC FUNCTION ActiveXBuildToolBarXbp( oCrt )
oTBar:create()
oTBar:addItem( "New" , hb_DirBase() + 'v_new.bmp' )
oTBar:addItem( "Select" , hb_DirBase() + 'v_selct1.bmp' )
oTBar:addItem( "New" , 'c:\harbour\contrib\gtwvg\tests\v_new.bmp' )
oTBar:addItem( "Select" , 'c:\harbour\contrib\gtwvg\tests\v_selct1.bmp' )
oTBar:addItem( )
oTBar:addItem( "FontDlg" , hb_DirBase() + 'v_calend.bmp' )
oTBar:addItem( "Tools" , hb_DirBase() + 'v_lock.bmp' )
oTBar:addItem( "Index" , hb_DirBase() + 'v_index.bmp' )
oTBar:addItem( "FontDlg" , 'c:\harbour\contrib\gtwvg\tests\v_calend.bmp' )
oTBar:addItem( "Tools" , 'c:\harbour\contrib\gtwvg\tests\v_lock.bmp' )
oTBar:addItem( "Index" , 'c:\harbour\contrib\gtwvg\tests\v_index.bmp' )
oTBar:addItem( )
oTBar:addItem( "Show" , hb_DirBase() + 'v_clclt.bmp' )
oTBar:addItem( "Hide" , hb_DirBase() + 'v_notes1.bmp' )
oTBar:addItem( "Show" , 'c:\harbour\contrib\gtwvg\tests\v_clclt.bmp' )
oTBar:addItem( "Hide" , 'c:\harbour\contrib\gtwvg\tests\v_notes1.bmp' )
RETURN oTBar
@@ -3824,7 +3844,7 @@ Static Function MyFunctionXbp( nMode )
tone( MUSIC_WAITON[1], 1 )
case nMode == 3
Win_MessageBox( , "Button clicked!" )
WVG_MessageBox( , "Button clicked!" )
case nMode == 101 // Charge
Eval( {|| tone(523,2),tone(698,2),tone(880,2),tone(1046,4),tone(880,2),tone(1046,8) } )
@@ -3856,7 +3876,7 @@ STATIC FUNCTION ExeFontDialogXbp( oCrt )
oFontDlg:familyName := "Courier New"
oFontDlg:strikeout := .T.
oFontDlg:underscore := .f.
//oFontDlg:activateOk := {|| Win_MessageBox( , 'activateOK Event Handelled in Windows!' ) }
//oFontDlg:activateOk := {|| WVG_MessageBox( , 'activateOK Event Handelled in Windows!' ) }
oFontDlg:nominalPointSize := 12
//oFontDlg:size := .f.
@@ -4013,9 +4033,9 @@ STATIC FUNCTION FetchText( nMode )
RETURN cText
/*----------------------------------------------------------------------*/
#if 0
#include "memoedit.ch"
#include "setcurs.ch"
#include "inkey.ch"
#include 'memoedit.ch'
#include 'setcurs.ch'
#include 'inkey.ch'
Function Editmemo()
Local cText := 'This is initial text'
@@ -4043,17 +4063,17 @@ Function EditFunc( nMode, nRow, nCol )
DO CASE
CASE nLoop == 1 // Set insert mode
SetCursor( SC_SPECIAL1 )
//hb_ToOutDebug( 'nLoop %i %s', nLoop, 'ME_INIT:K_INS' )
hb_ToOutDebug( 'nLoop %i %s', nLoop, 'ME_INIT:K_INS' )
RETURN K_INS
OTHERWISE
//hb_ToOutDebug( 'nLoop %i %s', nLoop, 'ME_INIT:OTHERWISE' )
hb_ToOutDebug( 'nLoop %i %s', nLoop, 'ME_INIT:OTHERWISE' )
RETURN ME_DEFAULT
ENDCASE
CASE nMode == ME_IDLE
//hb_ToOutDebug( 'nLoop %i %s', nLoop, 'ME_IDLE' )
hb_ToOutDebug( 'nLoop %i %s', nLoop, 'ME_IDLE' )
OTHERWISE
IF nKey == K_INS
@@ -4064,7 +4084,7 @@ Function EditFunc( nMode, nRow, nCol )
ENDIF
ENDIF
//hb_ToOutDebug( 'nLoop %i %s %i %i', nLoop, 'OTHERWISE', nKey, nMode )
hb_ToOutDebug( 'nLoop %i %s %i %i', nLoop, 'OTHERWISE', nKey, nMode )
ENDCASE
@@ -4370,3 +4390,154 @@ FUNCTION Vou_CreateOCrt( nT, nL, nB, nR, cTitle, xIcon, lModal, lRowCols, lHidde
RETURN oCrt
/*----------------------------------------------------------------------*/
/*
*
* Some More Solutions from my ERP Vouch
*
*/
/*----------------------------------------------------------------------*/
#define NTRIM( n ) ( ltrim( str( n ) ) )
function GetSome( msg, vrb, pass, pic, set_, wh, vl )
Local screen, l, oWin, s, i, nMaxLen, nLenMsg, nLenVrb, vlen, pnt_, clr, r, nLen, oldCrt, oCrt
Local t := maxrow()-7
Local b := maxrow()-3
Local nLen1 := 1
Local GetList := {}
Local dType := valtype(vrb)
DEFAULT msg TO 'Please Enter Required Value'
DEFAULT wh TO {|| .t. }
DEFAULT vl TO {|| .t. }
DEFAULT pass TO .f.
DEFAULT pic TO if( dType == 'Y', 'Y', '@! ' )
nLen := len(msg)
nMaxLen := 80
nLenMsg := len( msg )
do case
case dType == 'D' ; nLenVrb := 8
case dType == 'N' ; nLenVrb := 17 // len(str(vrb))
case dType == 'C' ; nLenVrb := len(vrb)
case dType == 'L' ; nLenVrb := 1
endcase
if nLenMsg + nLenVrb > nMaxLen // Only when vrb type c will be asked
nLenVrb := nMaxLen - nLenMsg - 7
pic := substr(pic,1,1)+'S'+NTRIM(nLenVrb)+substr(pic,2)
endif
pic := if( dType=='N', '@Z 999999999999.9999', if( !pass, pic, strtran( pic,'!','' ) ) )
l := IF( maxcol() > nLenMsg+nLenVrb+6, ( ( maxcol()+1 - (nLenMsg + nLenVrb + 7 ) ) / 2 ), 0 )
r := l + nLenMsg+nLenVrb + 6
oCrt := WvgCrt():new( , , { t,l }, { b-t, r-l }, , .t. )
oCrt:lModal := .t.
oCrt:create()
hb_gtInfo( HB_GTI_ICONFILE, 'EXCLAIM' )
hb_gtInfo( HB_GTI_WINTITLE, ' Info Required!' )
SetColor( 'N/W' )
CLS
b -= t
r -= l
t := 0
l := 0
if !pass
setcolor( 'GR+/B,N/GR*, , ,N/GR*' )
else
setcolor( 'GR+/B,GR+/GR*, , ,N/GR*' )
endif
Wvg_BoxRecessed( t+2, l+3+nlenMsg+1, t+2, l+3+nlenMsg+nLenVrb )
DispBox( t, l, b, r, ' ', 'N/B' )
oCrt:refresh()
if !pass
@ t+2, l+3 SAY msg GET vrb PICTURE pic WHEN eval(wh) VALID eval(vl)
setCursor(1)
else
@ t+2, l+3 SAY msg GET vrb PICTURE pic
SetCursor( 0 )
endif
read
oCrt:destroy()
return vrb
//----------------------------------------------------------------------//
function GetRange( type, msg, dBgn, dEnd )
local getlist := {}
local scr, nMsgRow, nGetRow, b, e,nColMsgB,nColMsgE, oCrt, oOCrt
local cBgn,cEnd,nGetCol1, nGetCol2, nLenGet, nLenWin
local cPic, nMsgCol1, nMsgCol2,nColFrom
LOCAL nT, nL, nB, nR
DEFAULT type TO 'N'
DEFAULT msg TO if( type=='N', 'Required Range','Required Date Range' )
b := if( type == 'N', 0, if( dBgn==nil, date(), dBgn ) )
e := if( type == 'N', 0, if( dEnd==nil, date(), dEnd ) )
cBgn := 'Begining ' + if( type == 'N', 'Value', 'Date' )
cEnd := 'Ending ' + if( type == 'N', 'Value', 'Date' )
nLenGet := if( type == 'N', 12, 8 )
cPic := if( type == 'N', '@Z 99999999.999','' )
nLenWin := 2+len( cBgn ) + 1 + nLenGet + 2 + len( cEnd ) + 1 + nLenGet + 2
nGetCol1 := 2+len( cBgn ) + 2
nGetCol2 := nGetCol1 + nLenGet + 2 + len( cEnd )
nMsgCol1 := 2
nMsgCol2 := 2 + len( cBgn ) + 1 + nLenGet + 2
nGetRow := 1
nColFrom := int( ( maxcol()-nLenWin )/2 )
nMsgRow := 13
nGetRow := 15
nGetCol1 := nColFrom+nGetCol1 ; nGetCol2 := nColFrom+nGetCol2
nMsgCol1 := nColFrom+nMsgCol1+1 ; nMsgCol2 := nColFrom+nMsgCol2
nT := 12-1; nL := nColFrom; nB := 17-2; nR := nL + nLenWin+1
/* Create new modal dialog */
B_CRT nT, nL, nB, nR TITLE msg MODAL INTO oCrt
/* Realign coordinates */
nT := 0; nL := 0; nB := maxrow(); nR := maxcol()
nGetCol1 -= nColFrom
nGetCol2 -= nColFrom
nMsgCol1 -= nColFrom
nMsgCol2 -= nColFrom
nMsgRow -= 12+1
nGetRow -= 12+1
DispBox( nT, nL, nB, nR, ' ', 'N/B' )
SetColor( 'w+/bg,N/GR*,,,n/w*' )
Wvg_BoxRecessed( nGetRow, nGetCol1, nGetRow, nGetCol1+7 )
Wvg_BoxRecessed( nGetRow, nGetCol2, nGetRow, nGetCol2+7 )
DispOutAt( nGetRow, nMsgCol1, cBgn, 'gr+/b' )
DispOutAt( nGetRow, nMsgCol2, cEnd, 'gr+/b' )
SetCursor( 1 )
@ nGetRow,nGetCol1 GET b VALID !empty(b) PICTURE cPic
@ nGetRow,nGetCol2 GET e VALID e >= b PICTURE cPic
read
if LastKey() == K_ESC
b := if( type == 'N', 0, ctod( '' ) )
e := b
endif
oCrt:destroy()
return { b, e }
/*----------------------------------------------------------------------*/

16
harbour/contrib/gtwvg/tests/demoxbp.prg
View File

@@ -53,7 +53,7 @@ FUNCTION Main()
//--------------------------- StatusBar ---------------------------\\
oSBar := WvgStatusBar():new( oCrt ):create( , , , , , .t. )
oSBar:panelClick := {|oPanel| Win_MessageBox( , oPanel:caption ) }
oSBar:panelClick := {|oPanel| WVG_MessageBox( , oPanel:caption ) }
oPanel := oSBar:getItem( 1 )
oPanel:caption := 'My Root Panel'
oPanel1 := oSBar:addItem()
@@ -102,7 +102,7 @@ FUNCTION Main()
aadd( aParts, 'DataRef' )
aeval( aParts, {|e| oListBox:addItem( e ) } )
oListBox:itemSelected := {|| Win_MessageBox( , oListBox:getCurItem() ) }
oListBox:itemSelected := {|| WVG_MessageBox( , oListBox:getCurItem() ) }
oListBox:setData( 3 ) // show selected 'XbpToolBar'
//--------------------------- PushButton --------------------------\\
@@ -122,7 +122,7 @@ FUNCTION Main()
oTree:create()
oTree:setColorBG( RGB( 120,15,240 ) )
oTree:setColorFG( RGB( 15,240,120 ) )
oTree:itemSelected := {|oItem| IF( oItem <> NIL, Win_MessageBox( , oItem:caption ), NIL ) }
oTree:itemSelected := {|oItem| IF( oItem <> NIL, WVG_MessageBox( , oItem:caption ), NIL ) }
oItem1 := oTree:rootItem:addItem( "First level A" )
@@ -185,7 +185,7 @@ FUNCTION Main()
oRadio := WvgRadioButton():new( oStatic2,, { 10,10 }, { 100,15 } )
oRadio:caption := "Com 1"
oRadio:selection := .T.
oRadio:selected := {|m1,m2,obj| m1:=m1, m2:=m2, Win_MessageBox( , obj:caption + IF( obj:selection, '< S >', '< N >' ) ) }
oRadio:selected := {|m1,m2,obj| m1:=m1, m2:=m2, WVG_MessageBox( , obj:caption + IF( obj:selection, '< S >', '< N >' ) ) }
oRadio:create()
oRadio := WvgRadioButton():new( oStatic2,, { 10,35 }, { 100,15 } )
@@ -195,7 +195,7 @@ FUNCTION Main()
oCheck := WvgCheckBox():New( oStatic2, , { 10,70 }, { 100,15 }, , .t. )
oCheck:caption := 'Checkbox A'
oCheck:create()
oCheck:selected := {|m1,m2,o| m1:=m1,m2:=m2, Win_MessageBox( , IF( o:getData(), 'I am selected','I am not selected' ) ) }
oCheck:selected := {|m1,m2,o| m1:=m1,m2:=m2, WVG_MessageBox( , IF( o:getData(), 'I am selected','I am not selected' ) ) }
// Create first 3State button, passing the position to :create()
oXbp := Wvg3State():new()
@@ -209,7 +209,7 @@ FUNCTION Main()
oXbp:caption := "3 State B"
oXbp:create( oStatic2 )
// Determine current state using :getData()
oXbp:selected := {| m1,m2,oBtn | m1:=m1,m2:=m2, Win_MessageBox( , "3State B", aState[ oBtn:getData()+1 ] ) }
oXbp:selected := {| m1,m2,oBtn | m1:=m1,m2:=m2, WVG_MessageBox( , "3State B", aState[ oBtn:getData()+1 ] ) }
// Create first SLE, specify position using :create()
// On :typeOut set the focus to the second SLE
@@ -383,7 +383,7 @@ Static Function MyFunctionXbp( nMode )
tone( MUSIC_WAITON[1], 1 )
case nMode == 3
Win_MessageBox( , "Button clicked!" )
WVG_MessageBox( , "Button clicked!" )
case nMode == 101 // Charge
Eval( {|| tone(523,2),tone(698,2),tone(880,2),tone(1046,4),tone(880,2),tone(1046,8) } )
@@ -415,7 +415,7 @@ STATIC FUNCTION ExeFontDialog( oCrt )
oFontDlg:familyName := "Courier New"
oFontDlg:strikeout := .T.
oFontDlg:underscore := .f.
//oFontDlg:activateOk := {|| Win_MessageBox( , 'activateOK Event Handelled in Windows!' ) }
//oFontDlg:activateOk := {|| WVG_MessageBox( , 'activateOK Event Handelled in Windows!' ) }
oFontDlg:nominalPointSize := 12
//oFontDlg:size := .f.

12
harbour/contrib/gtwvg/wvg3stat.prg
View File

@@ -140,7 +140,7 @@ METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) CLASS Wvg3S
::show()
ENDIF
::editBuffer := Win_Button_GetCheck( ::hWnd )
::editBuffer := WVG_Button_GetCheck( ::hWnd )
RETURN Self
@@ -154,7 +154,7 @@ METHOD handleEvent( nMessage, aNM ) CLASS Wvg3State
CASE nMessage == HB_GTE_COMMAND
IF aNM[ NMH_code ] == BN_CLICKED
::editBuffer := Win_Button_GetCheck( ::hWnd )
::editBuffer := WVG_Button_GetCheck( ::hWnd )
IF hb_isBlock( ::sl_lbClick )
eval( ::sl_lbClick, ::editBuffer, NIL, self )
@@ -165,13 +165,13 @@ METHOD handleEvent( nMessage, aNM ) CLASS Wvg3State
CASE nMessage == HB_GTE_CTLCOLOR
IF hb_isNumeric( ::clr_FG )
Win_SetTextColor( aNM[ 1 ], ::clr_FG )
WVG_SetTextColor( aNM[ 1 ], ::clr_FG )
ENDIF
IF hb_isNumeric( ::hBrushBG )
Win_SetBkMode( aNM[ 1 ], 1 )
WVG_SetBkMode( aNM[ 1 ], 1 )
RETURN ( ::hBrushBG )
ELSE
RETURN Win_GetCurrentBrush( aNM[ 1 ] )
RETURN WVG_GetCurrentBrush( aNM[ 1 ] )
ENDIF
ENDCASE
@@ -202,7 +202,7 @@ METHOD setCaption( xCaption ) CLASS Wvg3State
IF hb_isChar( xCaption )
::caption := xCaption
Win_SendMessageText( ::hWnd, WM_SETTEXT, 0, ::caption )
WVG_SendMessageText( ::hWnd, WM_SETTEXT, 0, ::caption )
ENDIF
RETURN Self

10
harbour/contrib/gtwvg/wvgax.prg
View File

@@ -77,7 +77,7 @@
/*----------------------------------------------------------------------*/
CLASS WvgActiveXControl FROM win_OleAuto, WvgWindow
CLASS WvgActiveXControl FROM WIN_OleAuto, WvgWindow
DATA CLSID INIT ""
DATA server INIT NIL
@@ -165,7 +165,7 @@ METHOD Create( oParent, oOwner, aPos, aSize, aPresParams, lVisible, cCLSID, cLic
Wvg_AxInit()
hWnd := Wvg_AxCreateWindow( Win_N2P( ::hContainer ), ::CLSID, ::nID, ;
hWnd := Wvg_AxCreateWindow( WIN_N2P( ::hContainer ), ::CLSID, ::nID, ;
::aPos[ 1 ], ::aPos[ 2 ], ::aSize[ 1 ], ::aSize[ 2 ], ;
::style, ::exStyle )
IF empty( hWnd )
@@ -180,7 +180,7 @@ METHOD Create( oParent, oOwner, aPos, aSize, aPresParams, lVisible, cCLSID, cLic
Wvg_AxDoVerb( hWnd, -4 )
::__hObj := hObj
::hWnd := Win_P2N( hWnd )
::hWnd := WIN_P2N( hWnd )
::oParent:addChild( SELF )
@@ -241,8 +241,8 @@ METHOD handleEvent( nEvent, aInfo ) CLASS WvgActiveXControl
METHOD Destroy() CLASS WvgActiveXControl
IF !empty( ::__hObj )
IF Win_IsWindow( ::hWnd )
Win_DestroyWindow( ::hWnd )
IF WVG_IsWindow( ::hWnd )
WVG_DestroyWindow( ::hWnd )
ENDIF
IF ::nEventHandler == "AdviseEvents"

6
harbour/contrib/gtwvg/wvgbitmp.prg
View File

@@ -125,7 +125,7 @@ METHOD new() CLASS WvgBitmap
METHOD create( oPScompat ) CLASS WvgBitmap
IF oPScompat == NIL
::hDCComp := Win_GetDC()
::hDCComp := WVG_GetDC()
::lDCToDestroy := .t.
ELSE
::hDCComp := oPScompat:hDC
@@ -138,10 +138,10 @@ METHOD create( oPScompat ) CLASS WvgBitmap
METHOD destroy() CLASS WvgBitmap
IF ::hBitmap <> nil
Win_DeleteObject( ::hBitmap )
WVG_DeleteObject( ::hBitmap )
ENDIF
IF ::lDCtoDestroy
Win_ReleaseDC( ::hDCcompat )
WVG_ReleaseDC( ::hDCcompat )
ENDIF
RETURN Self

16
harbour/contrib/gtwvg/wvgcheck.prg
View File

@@ -95,8 +95,8 @@ CLASS WvgCheckBox INHERIT WvgWindow, DataRef
METHOD destroy()
#if 0
METHOD editBuffer() INLINE ( Win_Button_GetCheck( ::hWnd ) == BST_CHECKED )
METHOD getData() INLINE ( Win_Button_GetCheck( ::hWnd ) == BST_CHECKED )
METHOD editBuffer() INLINE ( WVG_Button_GetCheck( ::hWnd ) == BST_CHECKED )
METHOD getData() INLINE ( WVG_Button_GetCheck( ::hWnd ) == BST_CHECKED )
METHOD setData( lCheck ) INLINE ::sendMessage( BM_SETCHECK, IF( lCheck, BST_CHECKED, BST_UNCHECKED ), 0 )
#endif
METHOD setCaption( cCaption )
@@ -141,7 +141,7 @@ METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) CLASS WvgCh
::sendMessage( BM_SETCHECK, BST_CHECKED, 0 )
ENDIF
::editBuffer := ( Win_Button_GetCheck( ::hWnd ) == BST_CHECKED )
::editBuffer := ( WVG_Button_GetCheck( ::hWnd ) == BST_CHECKED )
RETURN Self
@@ -155,7 +155,7 @@ METHOD handleEvent( nMessage, aNM ) CLASS WvgCheckBox
CASE nMessage == HB_GTE_COMMAND
IF aNM[ NMH_code ] == BN_CLICKED
::editBuffer := ( Win_Button_GetCheck( ::hWnd ) == BST_CHECKED )
::editBuffer := ( WVG_Button_GetCheck( ::hWnd ) == BST_CHECKED )
IF hb_isBlock( ::sl_lbClick )
eval( ::sl_lbClick, ::editBuffer, NIL, self )
@@ -166,13 +166,13 @@ METHOD handleEvent( nMessage, aNM ) CLASS WvgCheckBox
CASE nMessage == HB_GTE_CTLCOLOR
IF hb_isNumeric( ::clr_FG )
Win_SetTextColor( aNM[ 1 ], ::clr_FG )
WVG_SetTextColor( aNM[ 1 ], ::clr_FG )
ENDIF
IF hb_isNumeric( ::hBrushBG )
Win_SetBkMode( aNM[ 1 ], 1 )
WVG_SetBkMode( aNM[ 1 ], 1 )
RETURN ( ::hBrushBG )
ELSE
RETURN Win_GetCurrentBrush( aNM[ 1 ] )
RETURN WVG_GetCurrentBrush( aNM[ 1 ] )
ENDIF
ENDCASE
@@ -203,7 +203,7 @@ METHOD setCaption( xCaption ) CLASS WvgCheckBox
IF hb_isChar( xCaption )
::caption := xCaption
Win_SendMessageText( ::hWnd, WM_SETTEXT, 0, ::caption )
WVG_SendMessageText( ::hWnd, WM_SETTEXT, 0, ::caption )
ENDIF
RETURN Self

6
harbour/contrib/gtwvg/wvgclass.prg
View File

@@ -955,7 +955,7 @@ METHOD Create() CLASS WvtObject
METHOD Destroy() CLASS WvtObject
if ::hFont <> nil
Win_DeleteObject( ::hFont )
WVG_DeleteObject( ::hFont )
::hFont := nil
endif
@@ -1615,7 +1615,7 @@ METHOD Configure() CLASS WvtLabel
::nBackColorHoverOff := ::nBackColor
if ::hFont <> 0
Win_DeleteObject( ::hFont )
WVG_DeleteObject( ::hFont )
endif
::hFont := Wvt_CreateFont( ::cFont, ::nFontHeight, ::nFontWidth, ::nFontWeight, ::lItalic,;
@@ -2961,7 +2961,7 @@ METHOD Create() CLASS WvtBanner
METHOD Destroy() CLASS WvtBanner
Win_DeleteObject( ::oLabel:hFont )
WVG_DeleteObject( ::oLabel:hFont )
RETURN nil

6
harbour/contrib/gtwvg/wvgcrt.prg
View File

@@ -453,10 +453,10 @@ METHOD enable() CLASS WvgCrt
METHOD getFrameState() CLASS WvgCrt
IF Win_IsIconic( ::hWnd )
IF WVG_IsIconic( ::hWnd )
RETURN WVGDLG_FRAMESTAT_MINIMIZED
ENDIF
IF Win_IsZoomed( ::hWnd )
IF WVG_IsZoomed( ::hWnd )
RETURN WVGDLG_FRAMESTAT_MAXIMIZED
ENDIF
@@ -651,7 +651,7 @@ METHOD toBack() CLASS WvgCrt
/*----------------------------------------------------------------------*/
METHOD toFront() CLASS WvgCrt
RETURN Win_SetWindowPosToTop( ::hWnd )
RETURN WVG_SetWindowPosToTop( ::hWnd )
/*----------------------------------------------------------------------*/

4
harbour/contrib/gtwvg/wvgdarea.prg
View File

@@ -148,10 +148,10 @@ METHOD handleEvent( nMessage, aNM ) CLASS WvgDrawingArea
hDC := aNM[ 1 ]
IF hb_isNumeric( ::clr_FG )
Win_SetTextColor( hDC, ::clr_FG )
WVG_SetTextColor( hDC, ::clr_FG )
ENDIF
IF hb_isNumeric( ::hBrushBG )
Win_SetBkMode( hDC, 1 )
WVG_SetBkMode( hDC, 1 )
Wvg_FillRect( hDC, { 0,0,::currentSize()[1],::currentSize()[1]}, ::hBrushBG )
RETURN ( 0 )

8
harbour/contrib/gtwvg/wvgdatar.prg
View File

@@ -119,7 +119,7 @@ METHOD getData() CLASS DataRef
DO CASE
CASE ::className == "EDIT"
::sl_editBuffer := Win_GetMessageText( ::hWnd, WM_GETTEXT, ::bufferLength + 1 )
::sl_editBuffer := WVG_GetMessageText( ::hWnd, WM_GETTEXT, ::bufferLength + 1 )
ENDCASE
IF hb_isBlock( ::dataLink )
@@ -149,18 +149,18 @@ METHOD setData( xValue, mp2 ) CLASS DataRef
CASE ::className == "LISTBOX" /* Single Selection */
IF !empty( ::sl_editBuffer )
RETURN Win_LbSetCurSel( ::hWnd, ::sl_editBuffer - 1 ) >= 0
RETURN WVG_LbSetCurSel( ::hWnd, ::sl_editBuffer - 1 ) >= 0
ENDIF
RETURN .f.
CASE ::className == "SysTreeView32"
IF ::sl_editBuffer <> NIL .and. ::sl_editBuffer:hItem <> NIL
Win_TreeView_SelectItem( ::hWnd, ::sl_editBuffer:hItem )
WVG_TreeView_SelectItem( ::hWnd, ::sl_editBuffer:hItem )
ENDIF
CASE ::className == "EDIT"
IF hb_isChar( ::sl_editBuffer )
Win_SendMessageText( ::hWnd, WM_SETTEXT, 0, ::sl_editBuffer )
WVG_SendMessageText( ::hWnd, WM_SETTEXT, 0, ::sl_editBuffer )
ENDIF
CASE ::className == "SCROLLBAR"

10
harbour/contrib/gtwvg/wvgdlg.prg
View File

@@ -95,9 +95,9 @@ CLASS WvgDialog FROM WvgWindow
METHOD menuBar()
METHOD setFrameState( nState )
METHOD getFrameState()
METHOD calcClientRect() INLINE ::aRect := Win_GetClientRect( ::hWnd ), ;
METHOD calcClientRect() INLINE ::aRect := WVG_GetClientRect( ::hWnd ), ;
{ 0, 0, ::aRect[ 3 ], ::aRect[ 4 ] }
METHOD calcFrameRect() INLINE ::aRect := Win_GetWindowRect( ::hWnd ),;
METHOD calcFrameRect() INLINE ::aRect := WVG_GetWindowRect( ::hWnd ),;
{ ::aRect[ 1 ], ::aRect[ 2 ], ;
::aRect[ 3 ]-::aRect[ 1 ], ::aRect[ 4 ]-::aRect[ 2 ] }
ENDCLASS
@@ -189,7 +189,7 @@ METHOD destroy() CLASS WvgDialog
ENDIF
IF !empty( ::hBrushBG )
Win_DeleteObject( ::hBrushBG )
WVG_DeleteObject( ::hBrushBG )
ENDIF
::pGT := NIL
@@ -217,10 +217,10 @@ METHOD setFrameState( nState ) CLASS WvgDialog
/*----------------------------------------------------------------------*/
METHOD getFrameState() CLASS WvgDialog
IF Win_IsIconic( ::hWnd )
IF WVG_IsIconic( ::hWnd )
RETURN WVGDLG_FRAMESTAT_MINIMIZED
ENDIF
IF Win_IsZoomed( ::hWnd )
IF WVG_IsZoomed( ::hWnd )
RETURN WVGDLG_FRAMESTAT_MAXIMIZED
ENDIF

14
harbour/contrib/gtwvg/wvglistb.prg
View File

@@ -105,12 +105,12 @@ CLASS WvgListBox INHERIT WvgWindow, DataRef
METHOD setItemsHeight( nPixel ) INLINE ::sendMessage( LB_SETITEMHEIGHT, 0, nPixel )
METHOD setTopItem( nIndex ) INLINE ::sendMessage( LB_SETTOPINDEX, nIndex-1, 0 )
METHOD addItem( cItem ) INLINE Win_SendMessageText( ::hWnd, LB_ADDSTRING, 0, cItem )
METHOD addItem( cItem ) INLINE WVG_SendMessageText( ::hWnd, LB_ADDSTRING, 0, cItem )
METHOD clear() VIRTUAL
METHOD delItem( nIndex ) INLINE ::sendMessage( LB_DELETESTRING, nIndex-1, 0 )
METHOD getItem( nIndex ) INLINE Win_LbGetText( ::hWnd, nIndex-1 )
METHOD getItem( nIndex ) INLINE WVG_LbGetText( ::hWnd, nIndex-1 )
METHOD getTabstops() VIRTUAL
METHOD insItem( nIndex, cItem ) INLINE Win_SendMessageText( ::hWnd, LB_INSERTSTRING, nIndex-1, cItem )
METHOD insItem( nIndex, cItem ) INLINE WVG_SendMessageText( ::hWnd, LB_INSERTSTRING, nIndex-1, cItem )
METHOD setColumnWidth() VIRTUAL
METHOD setItem( nIndex, cItem ) INLINE ::delItem( nIndex ), ::insItem( nIndex, cItem )
METHOD setTabstops() VIRTUAL
@@ -195,7 +195,7 @@ METHOD handleEvent( nMessage, aNM ) CLASS WvgListBox
CASE nMessage == HB_GTE_COMMAND
IF aNM[ 1 ] == LBN_SELCHANGE
::nCurSelected := Win_LbGetCurSel( ::hWnd )+ 1
::nCurSelected := WVG_LbGetCurSel( ::hWnd )+ 1
IF hb_isBlock( ::sl_itemMarked )
eval( ::sl_itemMarked, NIL, NIL, self )
@@ -215,13 +215,13 @@ METHOD handleEvent( nMessage, aNM ) CLASS WvgListBox
CASE nMessage == HB_GTE_CTLCOLOR
IF hb_isNumeric( ::clr_FG )
Win_SetTextColor( aNM[ 1 ], ::clr_FG )
WVG_SetTextColor( aNM[ 1 ], ::clr_FG )
ENDIF
IF hb_isNumeric( ::hBrushBG )
Win_SetBkMode( aNM[ 1 ], 1 )
WVG_SetBkMode( aNM[ 1 ], 1 )
RETURN ( ::hBrushBG )
ELSE
RETURN Win_GetCurrentBrush( aNM[ 1 ] )
RETURN WVG_GetCurrentBrush( aNM[ 1 ] )
ENDIF
ENDCASE

28
harbour/contrib/gtwvg/wvgmenub.prg
View File

@@ -164,7 +164,7 @@ METHOD create( oParent, aPresParams, lVisible ) CLASS wvgMenuBar
::wvgWindow:create( ::oParent, , , , ::aPresParams, ::visible )
::hMenu := Win_CreateMenu()
::hMenu := WVG_CreateMenu()
if ::hMenu <> 0
/* check for if the parent already has a menu
@@ -173,14 +173,14 @@ METHOD create( oParent, aPresParams, lVisible ) CLASS wvgMenuBar
*/
/* finally set the menu */
#if 0
Win_SetMenu( ::oParent:getHWND(), ::hMenu )
WVG_SetMenu( ::oParent:getHWND(), ::hMenu )
#endif
/* how to make menu invisible ? */
if ( ::visible )
#if 0
Win_ShowWindow( ::oParent:getHWND(), SW_MINIMIZE )
Win_ShowWindow( ::oParent:getHWND(), SW_NORMAL )
WVG_ShowWindow( ::oParent:getHWND(), SW_MINIMIZE )
WVG_ShowWindow( ::oParent:getHWND(), SW_NORMAL )
#endif
endif
@@ -210,7 +210,7 @@ METHOD destroy() CLASS wvgMenuBar
IF !empty( ::hMenu )
::DelAllItems()
IF !Win_DestroyMenu( ::hMenu )
IF ! WVG_DestroyMenu( ::hMenu )
#if 0
Throw( ErrorNew( "wvtMenu", 1000, "wvtMenu:Destroy()", "Destroy menu FAILED", {},"wvt.prg" ) )
#endif
@@ -244,7 +244,7 @@ METHOD delItem( nItemNum ) CLASS wvgMenuBar
::aMenuItems[ nItemNum,WVT_MENU_MENUOBJ ]:Destroy()
ENDIF
IF ( lResult:= Win_DeleteMenu( ::hMenu, nItemNum-1, MF_BYPOSITION ) ) /* Remember ZERO base */
IF ( lResult:= WVG_DeleteMenu( ::hMenu, nItemNum-1, MF_BYPOSITION ) ) /* Remember ZERO base */
ADEL( ::aMenuItems, nItemNum )
ASIZE( ::aMenuItems, LEN( ::aMenuItems ) - 1 )
ELSE
@@ -310,15 +310,15 @@ METHOD addItem( aItem, p2, p3, p4 ) CLASS wvgMenuBar
end
aadd( ::aMenuItems, aItem )
Win_AppendMenu( ::hMenu, aItem[ 1 ], aItem[ 2 ], aItem[ 3 ] )
WVG_AppendMenu( ::hMenu, aItem[ 1 ], aItem[ 2 ], aItem[ 3 ] )
IF ++::nPass == 1
IF ::oParent:className $ "WVGCRT,WVGDIALOG"
Win_SetMenu( ::oParent:getHWND(), ::hMenu )
WVG_SetMenu( ::oParent:getHWND(), ::hMenu )
ENDIF
ELSE
IF ::oParent:className $ "WVGCRT,WVGDIALOG"
Win_DrawMenubar( ::oParent:getHWND() )
WVG_DrawMenubar( ::oParent:getHWND() )
ENDIF
ENDIF
@@ -378,7 +378,7 @@ METHOD checkItem( nItemNum, lCheck ) CLASS wvgMenuBar
DEFAULT lCheck TO .T.
IF !empty( ::hMenu ) .AND. !empty( nItemNum )
nRet := Win_CheckMenuItem( ::hMenu, nItemNum, MF_BYPOSITION + IF( lCheck, MF_CHECKED, MF_UNCHECKED ) )
nRet := WVG_CheckMenuItem( ::hMenu, nItemNum, MF_BYPOSITION + IF( lCheck, MF_CHECKED, MF_UNCHECKED ) )
ENDIF
RETURN IF( nRet == -1, .F., .T. )
@@ -389,7 +389,7 @@ METHOD enableItem( nItemNum ) CLASS wvgMenuBar
LOCAL lSuccess := .f.
IF !empty( ::hMenu ) .AND. !empty( nItemNum )
lSuccess := Win_EnableMenuItem( ::hMenu, nItemNum-1, MF_BYPOSITION + MF_ENABLED )
lSuccess := WVG_EnableMenuItem( ::hMenu, nItemNum-1, MF_BYPOSITION + MF_ENABLED )
ENDIF
RETURN ( lSuccess )
@@ -400,7 +400,7 @@ METHOD disableItem( nItemNum ) CLASS wvgMenuBar
LOCAL lSuccess := .f.
IF !empty( ::hMenu ) .AND. !empty( nItemNum )
lSuccess := Win_EnableMenuItem( ::hMenu, nItemNum-1, MF_BYPOSITION + MF_GRAYED )
lSuccess := WVG_EnableMenuItem( ::hMenu, nItemNum-1, MF_BYPOSITION + MF_GRAYED )
ENDIF
RETURN ( lSuccess )
@@ -571,7 +571,7 @@ METHOD create( oParent, aPresParams, lVisible ) CLASS wvgMenu
::className := "POPUPMENU"
::hMenu := Win_CreatePopupMenu()
::hMenu := WVG_CreatePopupMenu()
RETURN Self
@@ -595,7 +595,7 @@ METHOD popUp( oXbp, aPos, nDefaultItem, nControl ) CLASS wvgMenu
HB_SYMBOL_UNUSED( nDefaultItem )
HB_SYMBOL_UNUSED( nControl )
nCmd := Win_TrackPopupMenu( ::hMenu, TPM_LEFTALIGN + TPM_TOPALIGN + TPM_RETURNCMD, aPos[ 1 ], aPos[ 2 ], oXbp:hWnd )
nCmd := WVG_TrackPopupMenu( ::hMenu, TPM_LEFTALIGN + TPM_TOPALIGN + TPM_RETURNCMD, aPos[ 1 ], aPos[ 2 ], oXbp:hWnd )
aMenuItem := ::findMenuItemById( nCmd )
IF hb_isArray( aMenuItem ) .and. hb_isBlock( aMenuItem[ 2 ] )

6
harbour/contrib/gtwvg/wvgmle.prg
View File

@@ -225,13 +225,13 @@ METHOD handleEvent( nMessage, aNM ) CLASS WvgMLE
CASE nMessage == HB_GTE_CTLCOLOR
IF hb_isNumeric( ::clr_FG )
Win_SetTextColor( aNM[ 1 ], ::clr_FG )
WVG_SetTextColor( aNM[ 1 ], ::clr_FG )
ENDIF
IF hb_isNumeric( ::hBrushBG )
Win_SetBkMode( aNM[ 1 ], 1 )
WVG_SetBkMode( aNM[ 1 ], 1 )
RETURN ( ::hBrushBG )
ELSE
RETURN Win_GetCurrentBrush( aNM[ 1 ] )
RETURN WVG_GetCurrentBrush( aNM[ 1 ] )
ENDIF
ENDCASE

20
harbour/contrib/gtwvg/wvgpaint.prg
View File

@@ -275,9 +275,9 @@ FUNCTION Wvt_MakeDlgTemplate( nTop, nLeft, nRows, nCols, aOffSet, cTitle, nStyle
DEFAULT aOffSet[ 3 ] TO 0
DEFAULT aOffSet[ 4 ] TO 0
nBaseUnits := Win_GetDialogBaseUnits()
nBaseUnitsX := Win_LoWord( nBaseUnits )
nBaseUnitsY := Win_HiWord( nBaseUnits )
nBaseUnits := WVG_GetDialogBaseUnits()
nBaseUnitsX := WVG_LoWord( nBaseUnits )
nBaseUnitsY := WVG_HiWord( nBaseUnits )
nW := aFont[ 7 ] * nCols + aOffSet[ 4 ]
nH := aFont[ 6 ] * nRows + aOffSet[ 3 ]
@@ -349,9 +349,9 @@ Function Wvt_AddDlgItem( aDlg, nTop, nLeft, nRows, nCols, aOffSet,;
DEFAULT aOffSet[ 3 ] TO 0
DEFAULT aOffSet[ 4 ] TO 0
nBaseUnits := Win_GetDialogBaseUnits()
nBaseUnitsX := Win_LoWord( nBaseUnits )
nBaseUnitsY := Win_HiWord( nBaseUnits )
nBaseUnits := WVG_GetDialogBaseUnits()
nBaseUnitsX := WVG_LoWord( nBaseUnits )
nBaseUnitsY := WVG_HiWord( nBaseUnits )
aXY := Wvt_GetXYFromRowCol( nTop, nLeft )
nX := aXY[ 1 ] + aOffSet[ 2 ]
@@ -414,12 +414,12 @@ Function Wvt_CreateDialog( acnDlg, lOnTop, cbDlgProc, ncIcon, nTimerTicks, hMenu
endif
if valtype( nTimerTicks ) == "N"
Win_SetTimer( hDlg, 1001, nTimerTicks )
WVG_SetTimer( hDlg, 1001, nTimerTicks )
endif
if hMenu <> nil
Win_SetMenu( hDlg, hMenu )
WVG_SetMenu( hDlg, hMenu )
endif
@@ -482,7 +482,7 @@ FUNCTION WVT_GetOpenFileName( hWnd, cPath, cTitle, aFilter, nFlags, cIniDir, cDe
c += aFilter[n][1] + chr(0) + aFilter[n][2] + chr(0)
NEXT
ENDIF
if WIN_AND( nFlags,OFN_ALLOWMULTISELECT ) > 0
if WVG_AND( nFlags,OFN_ALLOWMULTISELECT ) > 0
cFile := space( 32000 )
ELSE
cFile := padr( trim( cPath ), 255, chr( 0 ) )
@@ -490,7 +490,7 @@ FUNCTION WVT_GetOpenFileName( hWnd, cPath, cTitle, aFilter, nFlags, cIniDir, cDe
cRet := WVT__GetOpenFileName( hWnd, @cFile, cTitle, c, nFlags, cIniDir, cDefExt, @nIndex )
if WIN_AND( nFlags,OFN_ALLOWMULTISELECT ) > 0
if WVG_AND( nFlags,OFN_ALLOWMULTISELECT ) > 0
n := AT( CHR(0)+ CHR(0), cFile )
cFile := LEFT( cFile,n )
aFiles := {}

6
harbour/contrib/gtwvg/wvgphdlr.prg
View File

@@ -334,7 +334,7 @@ METHOD notifier( nEvent, xParams ) CLASS WvgPartHandler
ENDIF
CASE nEvent == HB_GTE_SETFOCUS
/* aeval( ::aChildren, {|o| Win_InvalidateRect( o:hWnd ) } ) */
/* aeval( ::aChildren, {|o| WVG_InvalidateRect( o:hWnd ) } ) */
IF hb_isBlock( ::sl_setInputFocus )
eval( ::sl_setInputFocus, NIL, NIL, Self )
@@ -348,13 +348,13 @@ METHOD notifier( nEvent, xParams ) CLASS WvgPartHandler
::lHasInputFocus := .f.
CASE nEvent == HB_GTE_PAINT
/* aeval( ::aChildren, {|o| Win_InvalidateRect( o:hWnd ) } ) */
/* aeval( ::aChildren, {|o| WVG_InvalidateRect( o:hWnd ) } ) */
CASE nEvent == HB_GTE_GUIPARTS
/* Eventally every window be checked if it falls within returned rectangle or not
* then it will avoid a lot of flickering
*/
aeval( ::aChildren, {|o| Win_InvalidateRect( o:hWnd ) } )
aeval( ::aChildren, {|o| WVG_InvalidateRect( o:hWnd ) } )
CASE nEvent == HB_GTE_CLOSE
IF hb_isBlock( ::close )

6
harbour/contrib/gtwvg/wvgpushb.prg
View File

@@ -165,10 +165,10 @@ METHOD handleEvent( nMessage, aNM ) CLASS WvgPushButton
CASE nMessage == HB_GTE_CTLCOLOR
IF hb_isNumeric( ::clr_FG )
Win_SetTextColor( aNM[ 1 ], ::clr_FG )
WVG_SetTextColor( aNM[ 1 ], ::clr_FG )
ENDIF
IF hb_isNumeric( ::hBrushBG )
Win_SetBkMode( aNM[ 1 ], 1 )
WVG_SetBkMode( aNM[ 1 ], 1 )
RETURN ( ::hBrushBG )
ENDIF
@@ -202,7 +202,7 @@ METHOD setCaption( xCaption, cDll ) CLASS WvgPushButton
IF hb_isChar( xCaption )
::caption := xCaption
Win_SendMessageText( ::hWnd, WM_SETTEXT, 0, ::caption )
WVG_SendMessageText( ::hWnd, WM_SETTEXT, 0, ::caption )
ENDIF
RETURN Self

4
harbour/contrib/gtwvg/wvgradio.prg
View File

@@ -148,7 +148,7 @@ METHOD handleEvent( nMessage, aNM ) CLASS WvgRadioButton
CASE HB_GTE_COMMAND
IF aNM[ NMH_code ] == BN_CLICKED
::editBuffer := ( Win_Button_GetCheck( ::hWnd ) == BST_CHECKED )
::editBuffer := ( WVG_Button_GetCheck( ::hWnd ) == BST_CHECKED )
IF hb_isBlock( ::sl_lbClick )
eval( ::sl_lbClick, ::editBuffer, NIL, self )
@@ -185,7 +185,7 @@ METHOD setCaption( xCaption ) CLASS WvgRadioButton
IF hb_isChar( xCaption )
::caption := xCaption
Win_SendMessageText( ::hWnd, WM_SETTEXT, 0, ::caption )
WVG_SendMessageText( ::hWnd, WM_SETTEXT, 0, ::caption )
ENDIF
RETURN Self

2
harbour/contrib/gtwvg/wvgscrlb.prg
View File

@@ -206,7 +206,7 @@ METHOD handleEvent( nMessage, aNM ) CLASS WvgScrollBar
CASE nMessage == HB_GTE_CTLCOLOR
IF hb_isNumeric( ::hBrushBG )
Win_SetBkMode( aNM[ 1 ], 1 )
WVG_SetBkMode( aNM[ 1 ], 1 )
RETURN ( ::hBrushBG )
ENDIF

6
harbour/contrib/gtwvg/wvgsle.prg
View File

@@ -210,13 +210,13 @@ METHOD handleEvent( nMessage, aNM ) CLASS WvgSLE
CASE nMessage == HB_GTE_CTLCOLOR
IF hb_isNumeric( ::clr_FG )
Win_SetTextColor( aNM[ 1 ], ::clr_FG )
WVG_SetTextColor( aNM[ 1 ], ::clr_FG )
ENDIF
IF hb_isNumeric( ::hBrushBG )
Win_SetBkMode( aNM[ 1 ], 1 )
WVG_SetBkMode( aNM[ 1 ], 1 )
RETURN ( ::hBrushBG )
ELSE
RETURN Win_GetCurrentBrush( aNM[ 1 ] )
RETURN WVG_GetCurrentBrush( aNM[ 1 ] )
ENDIF
ENDCASE

6
harbour/contrib/gtwvg/wvgstatb.prg
View File

@@ -184,13 +184,13 @@ METHOD handleEvent( nMessage, aNM ) CLASS WvgStatusBar
CASE nMessage == HB_GTE_CTLCOLOR
IF hb_isNumeric( ::clr_FG )
Win_SetTextColor( aNM[ 1 ], ::clr_FG )
WVG_SetTextColor( aNM[ 1 ], ::clr_FG )
ENDIF
IF hb_isNumeric( ::hBrushBG )
Win_SetBkMode( aNM[ 1 ], 1 )
WVG_SetBkMode( aNM[ 1 ], 1 )
RETURN ( ::hBrushBG )
ELSE
RETURN Win_GetCurrentBrush( aNM[ 1 ] )
RETURN WVG_GetCurrentBrush( aNM[ 1 ] )
ENDIF
ENDCASE

16
harbour/contrib/gtwvg/wvgstatc.prg
View File

@@ -260,13 +260,13 @@ METHOD handleEvent( nMessage, aNM ) CLASS WvgStatic
CASE nMessage == HB_GTE_CTLCOLOR
IF hb_isNumeric( ::clr_FG )
Win_SetTextColor( aNM[ 1 ], ::clr_FG )
WVG_SetTextColor( aNM[ 1 ], ::clr_FG )
ENDIF
IF hb_isNumeric( ::hBrushBG )
Win_SetBkMode( aNM[ 1 ], 1 )
WVG_SetBkMode( aNM[ 1 ], 1 )
RETURN ( ::hBrushBG )
ELSE
RETURN Win_GetCurrentBrush( aNM[ 1 ] )
RETURN WVG_GetCurrentBrush( aNM[ 1 ] )
ENDIF
ENDCASE
@@ -280,7 +280,7 @@ METHOD destroy() CLASS WvgStatic
hb_ToOutDebug( " %s:destroy()", __objGetClsName() )
IF ::hBitmap <> nil
Win_DeleteObject( ::hBitmap )
WVG_DeleteObject( ::hBitmap )
ENDIF
::wvgWindow:destroy()
@@ -306,16 +306,16 @@ METHOD setCaption( xCaption, cDll )
DO CASE
CASE ::type == WVGSTATIC_TYPE_TEXT
Win_SendMessageText( ::hWnd, WM_SETTEXT, 0, ::caption )
WVG_SendMessageText( ::hWnd, WM_SETTEXT, 0, ::caption )
CASE ::type == WVGSTATIC_TYPE_BITMAP
IF ::hBitmap <> nil
Win_DeleteObject( ::hBitmap )
WVG_DeleteObject( ::hBitmap )
ENDIF
::hBitmap := Win_LoadImage( ::caption, IF( hb_isNUmeric( ::caption ), 1, 2 ) )
::hBitmap := WVG_LoadImage( ::caption, IF( hb_isNUmeric( ::caption ), 1, 2 ) )
Win_SendMessage( ::hWnd, STM_SETIMAGE, IMAGE_BITMAP, ::hBitmap )
WVG_SendMessage( ::hWnd, STM_SETIMAGE, IMAGE_BITMAP, ::hBitmap )
ENDCASE

38
harbour/contrib/gtwvg/wvgsysw.prg
View File

@@ -188,7 +188,7 @@ METHOD show() CLASS WvgSysWindow
METHOD setPos( aPos ) CLASS WvgSysWindow
Win_SetWindowPosition( ::hWnd, aPos[ 1 ], aPos[ 2 ], .f. )
WVG_SetWindowPosition( ::hWnd, aPos[ 1 ], aPos[ 2 ], .f. )
RETURN Self
@@ -197,7 +197,7 @@ METHOD setPos( aPos ) CLASS WvgSysWindow
METHOD currentPos() CLASS WvgSysWindow
LOCAL aRect
aRect := Win_GetWindowRect( ::hWnd )
aRect := WVG_GetWindowRect( ::hWnd )
RETURN { aRect[ 1 ], aRect[ 2 ] }
@@ -206,7 +206,7 @@ METHOD currentPos() CLASS WvgSysWindow
METHOD currentSize() CLASS WvgSysWindow
LOCAL aRect
aRect := Win_GetClientRect( ::hWnd )
aRect := WVG_GetClientRect( ::hWnd )
RETURN { aRect[ 3 ] - aRect[ 1 ], aRect[ 4 ] - aRect[ 2 ] }
@@ -355,43 +355,43 @@ METHOD wndProc( hWnd, nMessage, nwParam, nlParam ) CLASS WvgFontDialog
::hWnd := hWnd
IF !empty( ::title )
Win_setWindowText( ::hWnd, ::title )
WVG_setWindowText( ::hWnd, ::title )
ENDIF
IF !( ::buttonCancel )
Win_EnableWindow( Win_GetDlgItem( ::hWnd,IDCANCEL ), .f. )
WVG_EnableWindow( WVG_GetDlgItem( ::hWnd,IDCANCEL ), .f. )
ENDIF
IF !( ::buttonApply )
Win_EnableWindow( Win_GetDlgItem( ::hWnd,1026 ), .f. )
WVG_EnableWindow( WVG_GetDlgItem( ::hWnd,1026 ), .f. )
ENDIF
IF !( ::buttonHelp )
Win_EnableWindow( Win_GetDlgItem( ::hWnd,1038 ), .f. )
WVG_EnableWindow( WVG_GetDlgItem( ::hWnd,1038 ), .f. )
ENDIF
IF !( ::strikeOut )
Win_EnableWindow( Win_GetDlgItem( ::hWnd,1040 ), .f. )
WVG_EnableWindow( WVG_GetDlgItem( ::hWnd,1040 ), .f. )
ENDIF
IF !( ::underscore )
Win_EnableWindow( Win_GetDlgItem( ::hWnd,1041 ), .f. )
WVG_EnableWindow( WVG_GetDlgItem( ::hWnd,1041 ), .f. )
ENDIF
IF !( ::name )
Win_EnableWindow( Win_GetDlgItem( ::hWnd,1136 ), .f. )
WVG_EnableWindow( WVG_GetDlgItem( ::hWnd,1136 ), .f. )
ENDIF
IF !( ::style )
Win_EnableWindow( Win_GetDlgItem( ::hWnd,1137 ), .f. )
WVG_EnableWindow( WVG_GetDlgItem( ::hWnd,1137 ), .f. )
ENDIF
IF !( ::size )
Win_EnableWindow( Win_GetDlgItem( ::hWnd,1138 ), .f. )
WVG_EnableWindow( WVG_GetDlgItem( ::hWnd,1138 ), .f. )
ENDIF
IF ::aPos[ 1 ] > 0 .OR. ::aPos[ 2 ] > 0
aRect := Win_GetWindowRect( ::hWnd )
Win_MoveWindow( ::hWnd, ::aPos[ 1 ], ::aPos[ 2 ], aRect[3]-aRect[1], aRect[4]-aRect[2], .f. )
aRect := WVG_GetWindowRect( ::hWnd )
WVG_MoveWindow( ::hWnd, ::aPos[ 1 ], ::aPos[ 2 ], aRect[3]-aRect[1], aRect[4]-aRect[2], .f. )
ENDIF
RETURN 1
CASE nMessage == WM_COMMAND
nL := Win_LoWord( nwParam )
nH := Win_HiWord( nwParam )
nL := WVG_LoWord( nwParam )
nH := WVG_HiWord( nwParam )
HB_SYMBOL_UNUSED( nH )
@@ -429,7 +429,7 @@ METHOD display( nMode ) CLASS WvgFontDialog
IF nMode == 0
hWnd := ::oParent:hWnd
ELSE
hWnd := Win_GetDesktopWindow()
hWnd := WVG_GetDesktopWindow()
ENDIF
::ok := .f.
@@ -573,7 +573,7 @@ METHOD configure( cFontName ) CLASS WvgFont
METHOD destroy() CLASS WvgFont
IF ::hFont <> NIL
Win_DeleteObject( ::hFont )
WVG_DeleteObject( ::hFont )
ENDIF
RETURN Self
@@ -591,7 +591,7 @@ METHOD createFont() CLASS WvgFont
LOCAL aFont
IF ::hFont <> NIL
Win_DeleteObject( ::hFont )
WVG_DeleteObject( ::hFont )
::hFont := NIL
ENDIF

2
harbour/contrib/gtwvg/wvgtabpg.prg
View File

@@ -185,7 +185,7 @@ METHOD handleEvent( nMessage, aNM ) CLASS WvgTabPage
ENDCASE
CASE nMessage == HB_GTE_CTLCOLOR
RETURN Win_GetStockObject( NULL_BRUSH )
RETURN WVG_GetStockObject( NULL_BRUSH )
ENDCASE

8
harbour/contrib/gtwvg/wvgtoolb.prg
View File

@@ -264,13 +264,13 @@ METHOD destroy() CLASS WvgToolBar
IF ( nItems := Len( ::aItems ) ) > 0
FOR i := 1 TO nItems
IF ::aItems[ i,2 ]:image <> NIL
Win_DeleteObject( ::aItems[ i,2 ]:image )
WVG_DeleteObject( ::aItems[ i,2 ]:image )
ENDIF
IF ::aItems[ i,2 ]:disabledImage <> NIL
Win_DeleteObject( ::aItems[ i,2 ]:disabledImage )
WVG_DeleteObject( ::aItems[ i,2 ]:disabledImage )
ENDIF
IF ::aItems[ i,2 ]:hotImage <> NIL
Win_DeleteObject( ::aItems[ i,2 ]:hotImage )
WVG_DeleteObject( ::aItems[ i,2 ]:hotImage )
ENDIF
NEXT
ENDIF
@@ -295,7 +295,7 @@ METHOD configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) CLASS Wv
METHOD sendToolbarMessage( nMsg, p1, p2 ) CLASS WvgToolBar
RETURN Win_SendToolbarMessage( ::pWnd, nMsg, p1, p2 )
RETURN WVG_SendToolbarMessage( ::pWnd, nMsg, p1, p2 )
/*----------------------------------------------------------------------*/

8
harbour/contrib/gtwvg/wvgtreev.prg
View File

@@ -118,9 +118,9 @@ CLASS WvgTreeView INHERIT WvgWindow, DataRef
DATA textParentSelected INIT ""
DATA textItemSelected INIT ""
METHOD setColorFG( nRGB ) INLINE Win_TreeView_SetTextColor( ::hWnd, nRGB )
METHOD setColorBG( nRGB ) INLINE Win_TreeView_SetBkColor( ::hWnd, nRGB )
METHOD setColorLines( nRGB ) INLINE Win_TreeView_SetLineColor( ::hWnd, nRGB )
METHOD setColorFG( nRGB ) INLINE WVG_TreeView_SetTextColor( ::hWnd, nRGB )
METHOD setColorBG( nRGB ) INLINE WVG_TreeView_SetBkColor( ::hWnd, nRGB )
METHOD setColorLines( nRGB ) INLINE WVG_TreeView_SetLineColor( ::hWnd, nRGB )
METHOD handleEvent( nMessage, aInfo )
@@ -332,7 +332,7 @@ CLASS WvgTreeViewItem
METHOD configure()
METHOD destroy()
METHOD expand( lExpand ) INLINE Win_TreeView_Expand( ::hTree, ::hItem, ;
METHOD expand( lExpand ) INLINE WVG_TreeView_Expand( ::hTree, ::hItem, ;
IF( hb_isLogical( lExpand ), lExpand, .t. ) )
METHOD isExpanded()
METHOD setCaption( cCaption )

4
harbour/contrib/gtwvg/wvgutils.c
View File

@@ -730,11 +730,11 @@ HB_FUNC( WVT_CREATEPOPUPMENU )
/*----------------------------------------------------------------------*/
HB_FUNC_EXTERN( WIN_APPENDMENU );
HB_FUNC_EXTERN( WVG_APPENDMENU );
HB_FUNC( WVT_APPENDMENU )
{
HB_FUNC_EXEC( WIN_APPENDMENU );
HB_FUNC_EXEC( WVG_APPENDMENU );
}
/*----------------------------------------------------------------------*/

228
harbour/contrib/gtwvg/wvgwin.c
View File

@@ -68,7 +68,7 @@
/*----------------------------------------------------------------------*/
/*----------------------------------------------------------------------*/
/*
* Direct WinApi Functions - Prefixed WIN_*()
* Direct WinApi Functions - Prefixed WVG_*()
*/
/*----------------------------------------------------------------------*/
/*----------------------------------------------------------------------*/
@@ -93,7 +93,7 @@
# define GCLP_HBRBACKGROUND -10
#endif
#define WIN_STATUSBAR_MAX_PARTS 256
#define WVG_STATUSBAR_MAX_PARTS 256
/*----------------------------------------------------------------------*/
@@ -135,7 +135,7 @@ HB_FUNC( WVG_HINSTANCE )
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_SENDMESSAGE )
HB_FUNC( WVG_SENDMESSAGE )
{
LPTSTR cText = HB_ISBYREF( 4 ) ? HB_TCHAR_CONVTO( hb_parcx( 4 ) ) : NULL;
@@ -158,7 +158,7 @@ HB_FUNC( WIN_SENDMESSAGE )
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_SENDDLGITEMMESSAGE )
HB_FUNC( WVG_SENDDLGITEMMESSAGE )
{
PHB_ITEM pText = hb_param( 5, HB_IT_STRING );
char * cText = NULL;
@@ -187,93 +187,93 @@ HB_FUNC( WIN_SENDDLGITEMMESSAGE )
/*----------------------------------------------------------------------*/
/*
* WIN_SetTimer( hWnd, nIdentifier, nTimeOut )
* WVG_SetTimer( hWnd, nIdentifier, nTimeOut )
*/
HB_FUNC( WIN_SETTIMER )
HB_FUNC( WVG_SETTIMER )
{
hb_retl( SetTimer( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), hb_parni( 2 ), hb_parni( 3 ), NULL ) != 0 );
}
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_SETFOCUS )
HB_FUNC( WVG_SETFOCUS )
{
SetFocus( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ) );
}
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_SETTEXTCOLOR )
HB_FUNC( WVG_SETTEXTCOLOR )
{
hb_retnl( ( ULONG ) SetTextColor( ( HDC ) ( HB_PTRDIFF ) hb_parnint( 1 ), ( COLORREF ) hb_parnl( 2 ) ) );
}
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_SETBKCOLOR )
HB_FUNC( WVG_SETBKCOLOR )
{
hb_retnl( ( ULONG ) SetBkColor( ( HDC ) ( HB_PTRDIFF ) hb_parnint( 1 ), ( COLORREF ) hb_parnl( 2 ) ) );
}
/*----------------------------------------------------------------------*/
#if 0
HB_FUNC( WIN_SETBKMODE )
HB_FUNC( WVG_SETBKMODE )
{
hb_retni( ( int ) SetBkMode( ( HDC ) ( HB_PTRDIFF ) hb_parnint( 1 ), hb_parni( 2 ) ) );
}
#endif
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_GETSTOCKOBJECT )
HB_FUNC( WVG_GETSTOCKOBJECT )
{
hb_retnint( ( HB_PTRDIFF ) GetStockObject( hb_parni( 1 ) ) );
}
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_DELETEOBJECT )
HB_FUNC( WVG_DELETEOBJECT )
{
hb_retl( DeleteObject( ( HGDIOBJ ) ( HB_PTRDIFF ) hb_parnint( 1 ) ) );
}
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_SELECTOBJECT )
HB_FUNC( WVG_SELECTOBJECT )
{
hb_retnint( ( HB_PTRDIFF ) SelectObject( ( HDC ) ( HB_PTRDIFF ) hb_parnint( 1 ), ( HGDIOBJ ) ( HB_PTRDIFF ) hb_parnint( 2 ) ) );
}
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_LOWORD )
HB_FUNC( WVG_LOWORD )
{
hb_retnl( LOWORD( hb_parnl( 1 ) ) );
}
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_HIWORD )
HB_FUNC( WVG_HIWORD )
{
hb_retnl( HIWORD( hb_parnl( 1 ) ) );
}
/*----------------------------------------------------------------------*/
#if 0
HB_FUNC( WIN_MULDIV )
HB_FUNC( WVG_MULDIV )
{
hb_retni( MulDiv( hb_parni( 1 ), hb_parni( 2 ), hb_parni( 3 ) ) );
}
#endif
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_GETDIALOGBASEUNITS )
HB_FUNC( WVG_GETDIALOGBASEUNITS )
{
hb_retnl( ( LONG ) GetDialogBaseUnits() );
}
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_SETDLGITEMTEXT )
HB_FUNC( WVG_SETDLGITEMTEXT )
{
LPTSTR lpBuffer = HB_TCHAR_CONVTO( hb_parcx( 3 ) );
SetDlgItemText( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), hb_parni( 2 ), lpBuffer );
@@ -282,7 +282,7 @@ HB_FUNC( WIN_SETDLGITEMTEXT )
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_GETDLGITEMTEXT )
HB_FUNC( WVG_GETDLGITEMTEXT )
{
USHORT iLen = ( USHORT ) SendMessage( GetDlgItem( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), hb_parni( 2 ) ), WM_GETTEXTLENGTH, 0, 0 ) + 1;
LPTSTR cText = ( LPTSTR ) hb_xgrab( iLen * sizeof( TCHAR ) );
@@ -304,7 +304,7 @@ HB_FUNC( WIN_GETDLGITEMTEXT )
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_CHECKDLGBUTTON )
HB_FUNC( WVG_CHECKDLGBUTTON )
{
hb_retl( CheckDlgButton( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), hb_parni( 2 ),
( UINT )( HB_ISNUM( 3 ) ? hb_parni( 3 ) : hb_parl( 3 ) ) ) );
@@ -312,14 +312,14 @@ HB_FUNC( WIN_CHECKDLGBUTTON )
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_ISDLGBUTTONCHECKED )
HB_FUNC( WVG_ISDLGBUTTONCHECKED )
{
hb_retni( IsDlgButtonChecked( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), hb_parni( 2 ) ) );
}
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_CHECKRADIOBUTTON )
HB_FUNC( WVG_CHECKRADIOBUTTON )
{
hb_retl( CheckRadioButton( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), /* handle of dialog box */
hb_parni( 2 ), /* identifier of first radio button in group */
@@ -330,14 +330,14 @@ HB_FUNC( WIN_CHECKRADIOBUTTON )
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_GETDLGITEM )
HB_FUNC( WVG_GETDLGITEM )
{
hb_retnint( ( HB_PTRDIFF ) GetDlgItem( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), hb_parni( 2 ) ) );
}
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_MESSAGEBOX )
HB_FUNC( WVG_MESSAGEBOX )
{
HWND hWnd = HB_ISNUM( 1 ) ? ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ) : GetActiveWindow();
LPTSTR lpMsg = HB_TCHAR_CONVTO( hb_parcx( 2 ) );
@@ -351,7 +351,7 @@ HB_FUNC( WIN_MESSAGEBOX )
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_INVALIDATERECT )
HB_FUNC( WVG_INVALIDATERECT )
{
if( HB_ISARRAY( 2 ) )
{
@@ -370,9 +370,9 @@ HB_FUNC( WIN_INVALIDATERECT )
/*----------------------------------------------------------------------*/
/*
* Win_LoadIcon( ncIcon )
* WVG_LoadIcon( ncIcon )
*/
HB_FUNC( WIN_LOADICON )
HB_FUNC( WVG_LOADICON )
{
HICON hIcon;
@@ -392,12 +392,12 @@ HB_FUNC( WIN_LOADICON )
/*----------------------------------------------------------------------*/
/*
* Win_LoadImage( ncImage, nSource ) -> hImage
* WVG_LoadImage( ncImage, nSource ) -> hImage
* nSource == 0 ResourceIdByNumber
* nSource == 1 ResourceIdByName
* nSource == 2 ImageFromDiskFile
*/
HB_FUNC( WIN_LOADIMAGE )
HB_FUNC( WVG_LOADIMAGE )
{
HBITMAP hImage = 0;
LPTSTR lpBuffer = HB_TCHAR_CONVTO( hb_parcx( 1 ) );
@@ -424,7 +424,7 @@ HB_FUNC( WIN_LOADIMAGE )
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_GETCLIENTRECT )
HB_FUNC( WVG_GETCLIENTRECT )
{
RECT rc = { 0,0,0,0 };
PHB_ITEM info = hb_itemArrayNew( 4 );
@@ -441,9 +441,9 @@ HB_FUNC( WIN_GETCLIENTRECT )
/*----------------------------------------------------------------------*/
/*
* Win_DrawImage( hdc, nLeft, nTop, nWidth, nHeight, cImage ) in Pixels
* WVG_DrawImage( hdc, nLeft, nTop, nWidth, nHeight, cImage ) in Pixels
*/
HB_FUNC( WIN_DRAWIMAGE )
HB_FUNC( WVG_DRAWIMAGE )
{
hb_retl( hb_wvt_DrawImage( ( HDC ) ( HB_PTRDIFF ) hb_parnint( 1 ), hb_parni( 2 ), hb_parni( 3 ),
hb_parni( 4 ), hb_parni( 5 ), hb_parc( 6 ) ) );
@@ -451,19 +451,19 @@ HB_FUNC( WIN_DRAWIMAGE )
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_GETDC )
HB_FUNC( WVG_GETDC )
{
hb_retnint( ( HB_PTRDIFF ) GetDC( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ) ) );
}
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_RELEASEDC )
HB_FUNC( WVG_RELEASEDC )
{
hb_retl( ReleaseDC( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), ( HDC ) ( HB_PTRDIFF ) hb_parnint( 2 ) ) );
}
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_CREATEBRUSH )
HB_FUNC( WVG_CREATEBRUSH )
{
LOGBRUSH lb = { 0,0,0 };
@@ -478,9 +478,9 @@ HB_FUNC( WIN_CREATEBRUSH )
}
/*----------------------------------------------------------------------*/
/*
* Win_DrawText( hDC, cText, aRect, nFormat )
* WVG_DrawText( hDC, cText, aRect, nFormat )
*/
HB_FUNC( WIN_DRAWTEXT )
HB_FUNC( WVG_DRAWTEXT )
{
RECT rc = { 0,0,0,0 };
LPTSTR lpBuffer = HB_TCHAR_CONVTO( hb_parcx( 2 ) );
@@ -496,7 +496,7 @@ HB_FUNC( WIN_DRAWTEXT )
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_GETWINDOWRECT )
HB_FUNC( WVG_GETWINDOWRECT )
{
RECT rc;
PHB_ITEM info = hb_itemArrayNew( 4 );
@@ -513,44 +513,44 @@ HB_FUNC( WIN_GETWINDOWRECT )
/*----------------------------------------------------------------------*/
/*
* Win_MoveWindow( hWnd, nLeft, nTop, nWidth, nHeight, lRePaint )
* WVG_MoveWindow( hWnd, nLeft, nTop, nWidth, nHeight, lRePaint )
*/
HB_FUNC( WIN_MOVEWINDOW )
HB_FUNC( WVG_MOVEWINDOW )
{
MoveWindow( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), hb_parnl( 2 ), hb_parnl( 3 ), hb_parnl( 4 ), hb_parnl( 5 ), hb_parl( 6 ) );
}
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_GETDESKTOPWINDOW )
HB_FUNC( WVG_GETDESKTOPWINDOW )
{
wvg_rethandle( GetDesktopWindow() );
}
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_SETPARENT )
HB_FUNC( WVG_SETPARENT )
{
hb_retnint( ( HB_PTRDIFF ) SetParent( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), ( HWND ) ( HB_PTRDIFF ) hb_parnint( 2 ) ) );
}
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_BRINGWINDOWTOTOP )
HB_FUNC( WVG_BRINGWINDOWTOTOP )
{
hb_retl( BringWindowToTop( wvg_parhwnd( 1 ) ) );
}
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_SETFOREGROUNDWINDOW )
HB_FUNC( WVG_SETFOREGROUNDWINDOW )
{
hb_retl( BringWindowToTop( wvg_parhwnd( 1 ) ) );
}
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_SETWINDOWTEXT )
HB_FUNC( WVG_SETWINDOWTEXT )
{
LPTSTR text = HB_TCHAR_CONVTO( hb_parcx( 2 ) );
SetWindowText( wvg_parhwnd( 1 ), text );
@@ -559,35 +559,35 @@ HB_FUNC( WIN_SETWINDOWTEXT )
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_SETWINDOWLONG )
HB_FUNC( WVG_SETWINDOWLONG )
{
hb_retnl( SetWindowLong( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), hb_parni( 2 ), hb_parnl( 3 ) ) );
}
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_ISWINDOW )
HB_FUNC( WVG_ISWINDOW )
{
hb_retl( IsWindow( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ) ) );
}
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_ENABLEWINDOW )
HB_FUNC( WVG_ENABLEWINDOW )
{
hb_retl( EnableWindow( wvg_parhwnd( 1 ), hb_parl( 2 ) ) );
}
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_DESTROYWINDOW )
HB_FUNC( WVG_DESTROYWINDOW )
{
hb_retl( DestroyWindow( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ) ) );
}
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_CLIENTTOSCREEN )
HB_FUNC( WVG_CLIENTTOSCREEN )
{
POINT Point;
PHB_ITEM pArray = hb_param( 2 , HB_IT_ARRAY );
@@ -608,7 +608,7 @@ HB_FUNC( WIN_CLIENTTOSCREEN )
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_SCREENTOCLIENT )
HB_FUNC( WVG_SCREENTOCLIENT )
{
POINT Point;
PHB_ITEM pArray = hb_param( 2 , HB_IT_ARRAY );
@@ -629,28 +629,28 @@ HB_FUNC( WIN_SCREENTOCLIENT )
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_AND )
HB_FUNC( WVG_AND )
{
hb_retnl( hb_parnl(1) & hb_parnl(2) );
}
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_OR )
HB_FUNC( WVG_OR )
{
hb_retnl( hb_parnl(1) | hb_parnl(2) );
}
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_NOT )
HB_FUNC( WVG_NOT )
{
hb_retnl( ~( hb_parnl(1) ) );
}
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_TRACKPOPUPMENU )
HB_FUNC( WVG_TRACKPOPUPMENU )
{
HMENU hMenu = ( HMENU ) ( HB_PTRDIFF ) hb_parnint( 1 );
UINT uFlags = HB_ISNUM( 2 ) ? hb_parnl( 2 ) : TPM_CENTERALIGN | TPM_RETURNCMD;
@@ -675,7 +675,7 @@ HB_FUNC( WIN_TRACKPOPUPMENU )
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_CHOOSECOLOR )
HB_FUNC( WVG_CHOOSECOLOR )
{
CHOOSECOLOR cc;
COLORREF crCustClr[ 16 ];
@@ -698,7 +698,7 @@ HB_FUNC( WIN_CHOOSECOLOR )
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_FINDWINDOW )
HB_FUNC( WVG_FINDWINDOW )
{
HWND hwnd;
LPTSTR lpStr;
@@ -715,7 +715,7 @@ HB_FUNC( WIN_FINDWINDOW )
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_SLEEP )
HB_FUNC( WVG_SLEEP )
{
Sleep( hb_parni( 1 ) );
}
@@ -724,7 +724,7 @@ HB_FUNC( WIN_SLEEP )
/* Menu Manipulations */
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_SETMENU )
HB_FUNC( WVG_SETMENU )
{
HWND hWnd = ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 );
@@ -756,21 +756,21 @@ HB_FUNC( WIN_SETMENU )
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_CREATEMENU )
HB_FUNC( WVG_CREATEMENU )
{
hb_retnint( ( HB_PTRDIFF ) CreateMenu() );
}
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_CREATEPOPUPMENU )
HB_FUNC( WVG_CREATEPOPUPMENU )
{
hb_retnint( ( HB_PTRDIFF ) CreatePopupMenu() );
}
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_APPENDMENU )
HB_FUNC( WVG_APPENDMENU )
{
LPTSTR buffer;
int i, iLen;
@@ -811,63 +811,63 @@ HB_FUNC( WIN_APPENDMENU )
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_DELETEMENU )
HB_FUNC( WVG_DELETEMENU )
{
hb_retl( DeleteMenu( ( HMENU ) ( HB_PTRDIFF ) hb_parnint( 1 ), ( UINT ) hb_parni( 2 ), ( UINT ) hb_parni( 3 ) ) );
}
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_DESTROYMENU )
HB_FUNC( WVG_DESTROYMENU )
{
hb_retl( DestroyMenu( ( HMENU ) ( HB_PTRDIFF ) hb_parnint( 1 ) ) );
}
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_ENABLEMENUITEM )
HB_FUNC( WVG_ENABLEMENUITEM )
{
hb_retl( EnableMenuItem( ( HMENU ) ( HB_PTRDIFF ) hb_parnint( 1 ), ( UINT ) hb_parni( 2 ), ( UINT ) hb_parni( 3 ) ) );
}
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_CHECKMENUITEM )
HB_FUNC( WVG_CHECKMENUITEM )
{
hb_retni( CheckMenuItem( ( HMENU ) ( HB_PTRDIFF ) hb_parnint( 1 ), ( UINT ) hb_parni( 2 ), ( UINT ) hb_parni( 3 ) ) );
}
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_DRAWMENUBAR )
HB_FUNC( WVG_DRAWMENUBAR )
{
DrawMenuBar( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ) );
}
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_UPDATEWINDOW )
HB_FUNC( WVG_UPDATEWINDOW )
{
hb_retl( UpdateWindow( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ) ) );
}
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_SHOWWINDOW )
HB_FUNC( WVG_SHOWWINDOW )
{
hb_retl( ShowWindow( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), hb_parni( 2 ) ) );
}
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_MAKELPARAM )
HB_FUNC( WVG_MAKELPARAM )
{
hb_retnint( MAKELPARAM( hb_parnint( 1 ), hb_parnint( 2 ) ) );
}
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_CREATEWINDOWEX )
HB_FUNC( WVG_CREATEWINDOWEX )
{
HWND hWnd;
LPTSTR szClassName = HB_TCHAR_CONVTO( hb_parcx( 2 ) );
@@ -1254,13 +1254,13 @@ HB_FUNC( WVG_STATUSBARCREATEPANEL )
{
case 0:
{
int ptArray[ WIN_STATUSBAR_MAX_PARTS ];
int ptArray[ WVG_STATUSBAR_MAX_PARTS ];
int iParts;
RECT rc = { 0, 0, 0, 0 };
int n;
USHORT width;
iParts = ( int ) SendMessage( hWndSB, SB_GETPARTS, ( WPARAM ) WIN_STATUSBAR_MAX_PARTS, ( LPARAM ) ( LPINT ) ptArray );
iParts = ( int ) SendMessage( hWndSB, SB_GETPARTS, ( WPARAM ) WVG_STATUSBAR_MAX_PARTS, ( LPARAM ) ( LPINT ) ptArray );
GetClientRect( hWndSB, &rc );
width = ( USHORT ) ( rc.right / ( iParts + 1 ) );
@@ -1278,7 +1278,7 @@ HB_FUNC( WVG_STATUSBARCREATEPANEL )
case -1:
{
RECT rc = { 0, 0, 0, 0 };
int ptArray[ WIN_STATUSBAR_MAX_PARTS ];
int ptArray[ WVG_STATUSBAR_MAX_PARTS ];
if( GetClientRect( hWndSB, &rc ) )
{
@@ -1327,10 +1327,10 @@ HB_FUNC( WVG_STATUSBARREFRESH )
if( hWndSB && IsWindow( hWndSB ) )
{
int ptArray[ WIN_STATUSBAR_MAX_PARTS ];
int ptArray[ WVG_STATUSBAR_MAX_PARTS ];
int iParts,i;
iParts = SendMessage( hWndSB, SB_GETPARTS, WIN_STATUSBAR_MAX_PARTS, ( LPARAM ) ( LPINT ) ptArray );
iParts = SendMessage( hWndSB, SB_GETPARTS, WVG_STATUSBAR_MAX_PARTS, ( LPARAM ) ( LPINT ) ptArray );
ptArray[ iParts-1 ] = -1;
@@ -1346,7 +1346,7 @@ HB_FUNC( WVG_STATUSBARREFRESH )
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_SENDMESSAGETEXT )
HB_FUNC( WVG_SENDMESSAGETEXT )
{
LPTSTR lpBuffer = HB_TCHAR_CONVTO( hb_parcx( 4 ) );
@@ -1357,7 +1357,7 @@ HB_FUNC( WIN_SENDMESSAGETEXT )
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_GETMESSAGETEXT )
HB_FUNC( WVG_GETMESSAGETEXT )
{
TCHAR cText[ 32000 ];
@@ -1372,7 +1372,7 @@ HB_FUNC( WIN_GETMESSAGETEXT )
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_SETWNDPROC )
HB_FUNC( WVG_SETWNDPROC )
{
HWND hWnd = ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 );
WNDPROC wndProc = ( WNDPROC ) ( HB_PTRDIFF ) hb_parnint( 2 );
@@ -1389,7 +1389,7 @@ HB_FUNC( WIN_SETWNDPROC )
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_DEFWINDOWPROC )
HB_FUNC( WVG_DEFWINDOWPROC )
{
hb_retnint( DefWindowProc( wvg_parhwnd( 1 ),
hb_parni( 2 ),
@@ -1399,7 +1399,7 @@ HB_FUNC( WIN_DEFWINDOWPROC )
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_CALLWINDOWPROC )
HB_FUNC( WVG_CALLWINDOWPROC )
{
hb_retnint( CallWindowProc( wvg_parwndproc( 1 ),
wvg_parhwnd( 2 ),
@@ -1485,7 +1485,7 @@ HB_FUNC( WVG_GETNMTREEVIEWINFO )
/* TreeView Functions */
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_TREEVIEW_SETTEXTCOLOR )
HB_FUNC( WVG_TREEVIEW_SETTEXTCOLOR )
{
#if ! defined( HB_OS_WIN_CE )
hb_retl( TreeView_SetTextColor( wvg_parhwnd( 1 ), wvg_parcolor( 2 ) ) );
@@ -1493,7 +1493,7 @@ HB_FUNC( WIN_TREEVIEW_SETTEXTCOLOR )
}
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_TREEVIEW_SETBKCOLOR )
HB_FUNC( WVG_TREEVIEW_SETBKCOLOR )
{
#if ! defined( HB_OS_WIN_CE )
hb_retl( TreeView_SetBkColor( wvg_parhwnd( 1 ), wvg_parcolor( 2 ) ) );
@@ -1501,7 +1501,7 @@ HB_FUNC( WIN_TREEVIEW_SETBKCOLOR )
}
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_TREEVIEW_SETLINECOLOR )
HB_FUNC( WVG_TREEVIEW_SETLINECOLOR )
{
#if 0
hb_retl( TreeView_SetLineColor( wvg_parhwnd( 1 ), wvg_parcolor( 2 ) ) );
@@ -1509,7 +1509,7 @@ HB_FUNC( WIN_TREEVIEW_SETLINECOLOR )
}
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_TREEVIEW_SELECTITEM )
HB_FUNC( WVG_TREEVIEW_SELECTITEM )
{
hb_retl( TreeView_SelectItem( wvg_parhwnd( 1 ), wvg_parhandle( 2 ) ) );
}
@@ -1587,14 +1587,14 @@ HB_FUNC( WVG_TREEVIEW_ADDITEM )
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_TREEVIEW_EXPAND )
HB_FUNC( WVG_TREEVIEW_EXPAND )
{
hb_retl( TreeView_Expand( wvg_parhwnd( 1 ), wvg_parhandle( 2 ), ( hb_parl( 3 ) ? TVE_EXPAND : TVE_COLLAPSE ) ) );
}
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_TVIS_EXPANDED )
HB_FUNC( WVG_TVIS_EXPANDED )
{
#if 0
hb_retl( TreeView_GetItemState( wvg_parhwnd( 1 ), wvg_parhandle( 2 ), ( UINT ) TVIS_EXPANDED ) );
@@ -1657,7 +1657,7 @@ HB_FUNC( WVG_TREEVIEW_SHOWEXPANDED )
/* ListBox Functions */
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_LBGETTEXT )
HB_FUNC( WVG_LBGETTEXT )
{
TCHAR text[ MAX_PATH + 1 ];
char * szText;
@@ -1671,14 +1671,14 @@ HB_FUNC( WIN_LBGETTEXT )
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_LBGETCURSEL )
HB_FUNC( WVG_LBGETCURSEL )
{
hb_retni( ListBox_GetCurSel( wvg_parhwnd( 1 ) ) );
}
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_LBSETCURSEL )
HB_FUNC( WVG_LBSETCURSEL )
{
hb_retni( ListBox_SetCurSel( wvg_parhwnd( 1 ), hb_parni( 2 ) ) );
}
@@ -1687,13 +1687,13 @@ HB_FUNC( WIN_LBSETCURSEL )
/* Buttons */
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_BUTTON_GETCHECK )
HB_FUNC( WVG_BUTTON_GETCHECK )
{
hb_retnl( Button_GetCheck( wvg_parhwnd( 1 ) ) );
}
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_ISICONIC )
HB_FUNC( WVG_ISICONIC )
{
#if ! defined( HB_OS_WIN_CE )
hb_retl( IsIconic( wvg_parhwnd( 1 ) ) );
@@ -1703,7 +1703,7 @@ HB_FUNC( WIN_ISICONIC )
}
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_ISZOOMED )
HB_FUNC( WVG_ISZOOMED )
{
#if ! defined( HB_OS_WIN_CE )
hb_retl( IsZoomed( wvg_parhwnd( 1 ) ) );
@@ -1713,9 +1713,9 @@ HB_FUNC( WIN_ISZOOMED )
}
/*----------------------------------------------------------------------*/
/*
* Win_SetDCBrushColor( hDC, nRGB )
* WVG_SetDCBrushColor( hDC, nRGB )
*/
HB_FUNC( WIN_SETDCBRUSHCOLOR )
HB_FUNC( WVG_SETDCBRUSHCOLOR )
{
#if ( _WIN32_WINNT >= 0x0500 )
wvg_rethandle( SetDCBrushColor( wvg_parhdc( 1 ), wvg_parcolor( 2 ) ) );
@@ -1725,9 +1725,9 @@ HB_FUNC( WIN_SETDCBRUSHCOLOR )
}
/*----------------------------------------------------------------------*/
/*
* Win_SetDCPenColor( hDC, nRGB )
* WVG_SetDCPenColor( hDC, nRGB )
*/
HB_FUNC( WIN_SETDCPENCOLOR )
HB_FUNC( WVG_SETDCPENCOLOR )
{
#if ( _WIN32_WINNT >= 0x0500 )
wvg_rethandle( SetDCPenColor( wvg_parhdc( 1 ), wvg_parcolor( 2 ) ) );
@@ -1738,34 +1738,34 @@ HB_FUNC( WIN_SETDCPENCOLOR )
/*----------------------------------------------------------------------*/
/*
* Win_GetCurrentObject( hDC, nObjType )
* WVG_GetCurrentObject( hDC, nObjType )
*/
HB_FUNC( WIN_GETCURRENTOBJECT )
HB_FUNC( WVG_GETCURRENTOBJECT )
{
wvg_rethandle( GetCurrentObject( wvg_parhdc( 1 ), hb_parni( 2 ) ) );
}
/*----------------------------------------------------------------------*/
/*
* Win_GetCurrentBrush( hDC )
* WVG_GetCurrentBrush( hDC )
*/
HB_FUNC( WIN_GETCURRENTBRUSH )
HB_FUNC( WVG_GETCURRENTBRUSH )
{
wvg_rethandle( GetCurrentObject( wvg_parhdc( 1 ), OBJ_BRUSH ) );
}
/*----------------------------------------------------------------------*/
/*
* Win_GetCurrentFornt( hDC )
* WVG_GetCurrentFornt( hDC )
*/
HB_FUNC( WIN_GETCURRENTFONT )
HB_FUNC( WVG_GETCURRENTFONT )
{
wvg_rethandle( GetCurrentObject( wvg_parhdc( 1 ), OBJ_FONT ) );
}
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_SETWINDOWPOSTOBACK )
HB_FUNC( WVG_SETWINDOWPOSTOBACK )
{
hb_retl( SetWindowPos( wvg_parhwnd( 1 ), ( HWND ) HWND_BOTTOM, 0, 0, 0, 0 ,
SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE ) );
@@ -1773,7 +1773,7 @@ HB_FUNC( WIN_SETWINDOWPOSTOBACK )
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_SETWINDOWPOSTOTOP )
HB_FUNC( WVG_SETWINDOWPOSTOTOP )
{
hb_retl( SetWindowPos( wvg_parhwnd( 1 ), ( HWND ) HWND_TOP, 0, 0, 0, 0 ,
SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE ) );
@@ -1781,7 +1781,7 @@ HB_FUNC( WIN_SETWINDOWPOSTOTOP )
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_SETWINDOWSIZE )
HB_FUNC( WVG_SETWINDOWSIZE )
{
hb_retl( SetWindowPos( wvg_parhwnd( 1 ), NULL, 0, 0, hb_parni( 2 ), hb_parni( 3 ),
hb_parl( 4 ) ? 0 : SWP_NOREDRAW | SWP_NOZORDER | SWP_NOMOVE | SWP_NOACTIVATE ) );
@@ -1789,7 +1789,7 @@ HB_FUNC( WIN_SETWINDOWSIZE )
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_SETWINDOWPOSITION )
HB_FUNC( WVG_SETWINDOWPOSITION )
{
hb_retl( SetWindowPos( wvg_parhwnd( 1 ), NULL, hb_parni( 2 ), hb_parni( 3 ), 0, 0,
hb_parl( 4 ) ? 0 : SWP_NOREDRAW | SWP_NOZORDER | SWP_NOSIZE | SWP_NOACTIVATE ) );
@@ -1797,7 +1797,7 @@ HB_FUNC( WIN_SETWINDOWPOSITION )
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_SETWINDOWPOSANDSIZE )
HB_FUNC( WVG_SETWINDOWPOSANDSIZE )
{
hb_retl( SetWindowPos( wvg_parhwnd( 1 ), NULL, hb_parni( 2 ), hb_parni( 3 ),
hb_parni( 4 ), hb_parni( 5 ),
@@ -2043,9 +2043,9 @@ HB_FUNC( WVG_SETCURRENTBRUSH )
}
/*----------------------------------------------------------------------*/
/*
* Win_SetLayeredWindowAttributes( hWnd, nRGB, nOpacityFactor [0-255] )
* WVG_SetLayeredWindowAttributes( hWnd, nRGB, nOpacityFactor [0-255] )
*/
HB_FUNC( WIN_SETLAYEREDWINDOWATTRIBUTES )
HB_FUNC( WVG_SETLAYEREDWINDOWATTRIBUTES )
{
#if ( _WIN32_WINNT >= 0x0500 )
HINSTANCE h;
@@ -2151,7 +2151,7 @@ HB_FUNC( WVG_ADDTOOLBARBUTTON )
}
/*----------------------------------------------------------------------*/
HB_FUNC( WIN_SENDTOOLBARMESSAGE )
HB_FUNC( WVG_SENDTOOLBARMESSAGE )
{
/* #if ! defined( HB_OS_WIN_CE ) */
HWND hTB = wapi_par_HWND( 1 );
@@ -2355,7 +2355,7 @@ HB_FUNC( WVG_REGISTERCLASS_BYNAME )
/*----------------------------------------------------------------------*/
/*
* Function with Win_FillRect() exists in hbwin:win_parn1.c with different approach.
* Function with WVG_FillRect() exists in hbwin:win_parn1.c with different approach.
*/
HB_FUNC( WVG_FILLRECT )
{

60
harbour/contrib/gtwvg/wvgwnd.prg
View File

@@ -353,8 +353,8 @@ METHOD destroy() CLASS WvgWindow
WVG_ReleaseWindowProcBlock( ::pWnd )
#endif
IF Win_IsWindow( ::hWnd )
Win_DestroyWindow( ::hWnd )
IF WVG_IsWindow( ::hWnd )
WVG_DestroyWindow( ::hWnd )
ENDIF
#ifdef __BYASCALLBACK__
@@ -364,7 +364,7 @@ METHOD destroy() CLASS WvgWindow
#endif
IF ::hBrushBG <> NIL
Win_DeleteObject( ::hBrushBG )
WVG_DeleteObject( ::hBrushBG )
ENDIF
RETURN Self
@@ -375,7 +375,7 @@ METHOD SetWindowProcCallback() CLASS WvgWindow
#ifdef __BYASCALLBACK__
::nWndProc := hb_AsCallBack( "CONTROLWNDPROC", Self )
::nOldProc := Win_SetWndProc( ::hWnd, ::nWndProc )
::nOldProc := WVG_SetWndProc( ::hWnd, ::nWndProc )
#endif
#ifdef __BYSETPROP__
@@ -394,7 +394,7 @@ METHOD captureMouse() CLASS WvgWindow
METHOD disable() CLASS WvgWindow
IF Win_EnableWindow( ::hWnd, .f. )
IF WVG_EnableWindow( ::hWnd, .f. )
::is_enabled := .f.
RETURN .t.
ENDIF
@@ -405,7 +405,7 @@ METHOD disable() CLASS WvgWindow
METHOD enable() CLASS WvgWindow
IF Win_EnableWindow( ::hWnd, .t. )
IF WVG_EnableWindow( ::hWnd, .t. )
::is_enabled := .t.
RETURN .t.
ENDIF
@@ -416,8 +416,8 @@ METHOD enable() CLASS WvgWindow
METHOD hide() CLASS WvgWindow
IF Win_IsWindow( ::hWnd )
Win_ShowWindow( ::hWnd, SW_HIDE )
IF WVG_IsWindow( ::hWnd )
WVG_ShowWindow( ::hWnd, SW_HIDE )
::is_hidden := .t.
ENDIF
@@ -427,7 +427,7 @@ METHOD hide() CLASS WvgWindow
METHOD invalidateRect( aRect ) CLASS WvgWindow
RETURN Win_InvalidateRect( ::hWnd, aRect )
RETURN WVG_InvalidateRect( ::hWnd, aRect )
/*----------------------------------------------------------------------*/
@@ -447,7 +447,7 @@ METHOD setColorBG( nRGB ) CLASS WvgWindow
LOCAL hBrush
IF hb_isNumeric( nRGB )
hBrush := Win_CreateBrush( BS_SOLID, nRGB, 0 )
hBrush := WVG_CreateBrush( BS_SOLID, nRGB, 0 )
IF hBrush <> 0
::clr_BG := nRGB
::hBrushBG := hBrush
@@ -491,7 +491,7 @@ METHOD setPos( aPos, lPaint ) CLASS WvgWindow
exit
OTHERWISE
Win_SetWindowPosition( ::hWnd, aPos[ 1 ], aPos[ 2 ], lPaint )
WVG_SetWindowPosition( ::hWnd, aPos[ 1 ], aPos[ 2 ], lPaint )
EXIT
END
@@ -513,8 +513,8 @@ METHOD setPosAndSize( aPos, aSize, lPaint ) CLASS WvgWindow
exit
OTHERWISE
/*Win_MoveWindow( ::hWnd, aPos[ 1 ], aPos[ 2 ], aSize[ 1 ], aSize[ 2 ], lPaint ) */
Win_SetWindowPosAndSize( ::hWnd, aPos[ 1 ], aPos[ 2 ], aSize[ 1 ], aSize[ 2 ], lPaint )
/*WVG_MoveWindow( ::hWnd, aPos[ 1 ], aPos[ 2 ], aSize[ 1 ], aSize[ 2 ], lPaint ) */
WVG_SetWindowPosAndSize( ::hWnd, aPos[ 1 ], aPos[ 2 ], aSize[ 1 ], aSize[ 2 ], lPaint )
EXIT
END
@@ -532,8 +532,8 @@ METHOD setSize( aSize, lPaint ) CLASS WvgWindow
SWITCH ::objType
CASE objTypeDialog
/*Win_MoveWindow( ::hWnd, 0, 0, aSize[ 1 ], aSize[ 2 ], lPaint ) */
Win_SetWindowSize( ::hWnd, aSize[ 1 ], aSize[ 2 ], lPaint )
/*WVG_MoveWindow( ::hWnd, 0, 0, aSize[ 1 ], aSize[ 2 ], lPaint ) */
WVG_SetWindowSize( ::hWnd, aSize[ 1 ], aSize[ 2 ], lPaint )
EXIT
END
@@ -565,7 +565,7 @@ METHOD isDerivedFrom( cClassORoObject ) CLASS WvgWindow
METHOD show() CLASS WvgWindow
Win_ShowWindow( ::hWnd, SW_NORMAL )
WVG_ShowWindow( ::hWnd, SW_NORMAL )
::is_hidden := .f.
::lHasInputFocus := .t.
@@ -575,14 +575,14 @@ METHOD show() CLASS WvgWindow
METHOD toBack() CLASS WvgWindow
RETURN Win_SetWindowPosToBack( ::hWnd )
RETURN WVG_SetWindowPosToBack( ::hWnd )
/*----------------------------------------------------------------------*/
METHOD toFront() CLASS WvgWindow
/*RETURN Win_SetForegroundWindow( ::hWnd ) */
RETURN Win_SetWindowPosToTop( ::hWnd )
/*RETURN WVG_SetForegroundWindow( ::hWnd ) */
RETURN WVG_SetWindowPosToTop( ::hWnd )
/*----------------------------------------------------------------------*/
@@ -653,7 +653,7 @@ METHOD setPresParam() CLASS WvgWindow
METHOD currentPos() CLASS WvgWindow
LOCAL aRect
aRect := Win_GetWindowRect( ::hWnd )
aRect := WVG_GetWindowRect( ::hWnd )
RETURN { aRect[ 1 ], aRect[ 2 ] }
@@ -662,7 +662,7 @@ METHOD currentPos() CLASS WvgWindow
METHOD currentSize() CLASS WvgWindow
LOCAL aRect
aRect := Win_GetClientRect( ::hWnd )
aRect := WVG_GetClientRect( ::hWnd )
RETURN { aRect[ 3 ] - aRect[ 1 ], aRect[ 4 ] - aRect[ 2 ] }
@@ -1217,7 +1217,7 @@ METHOD setFocus() CLASS WvgWindow
METHOD sendMessage( nMessage, nlParam, nwParam ) CLASS WvgWindow
RETURN Win_SendMessage( ::hWnd, nMessage, nlParam, nwParam )
RETURN WVG_SendMessage( ::hWnd, nMessage, nlParam, nwParam )
/*----------------------------------------------------------------------*/
@@ -1239,7 +1239,7 @@ METHOD createControl() CLASS WvgWindow
::nID := ::oParent:GetControlId()
hWnd := Win_CreateWindowEx( ::exStyle, ;
hWnd := WVG_CreateWindowEx( ::exStyle, ;
::className, ;
"", ; /* window name */
::style, ;
@@ -1254,7 +1254,7 @@ METHOD createControl() CLASS WvgWindow
IF ( hWnd <> 0 )
::hWnd := hWnd
::pWnd := WIN_N2P( hWnd )
::sendMessage( WM_SETFONT, Win_GetStockObject( DEFAULT_GUI_FONT ), 1 )
::sendMessage( WM_SETFONT, WVG_GetStockObject( DEFAULT_GUI_FONT ), 1 )
ENDIF
RETURN Self
@@ -1276,8 +1276,8 @@ METHOD ControlWndProc( hWnd, nMessage, nwParam, nlParam ) CLASS WvgWindow
EXIT
CASE WM_COMMAND
nCtrlID := Win_LOWORD( nwParam )
nNotifctn := Win_HIWORD( nwParam )
nCtrlID := WVG_LOWORD( nwParam )
nNotifctn := WVG_HIWORD( nwParam )
hWndCtrl := nlParam
IF hWndCtrl == 0 /* It is menu */
@@ -1325,7 +1325,7 @@ METHOD ControlWndProc( hWnd, nMessage, nwParam, nlParam ) CLASS WvgWindow
nReturn := oObj:handleEvent( HB_GTE_CTLCOLOR, { nwParam, nlParam } )
IF nReturn == 1
RETURN Win_CallWindowProc( ::nOldProc, hWnd, nMessage, nwParam, nlParam )
RETURN WVG_CallWindowProc( ::nOldProc, hWnd, nMessage, nwParam, nlParam )
ELSE
RETURN nReturn
ENDIF
@@ -1333,11 +1333,11 @@ METHOD ControlWndProc( hWnd, nMessage, nwParam, nlParam ) CLASS WvgWindow
EXIT
CASE WM_HSCROLL
::handleEvent( HB_GTE_HSCROLL, { Win_LoWord( nwParam ), Win_HiWord( nwParam ), nlParam } )
::handleEvent( HB_GTE_HSCROLL, { WVG_LoWord( nwParam ), WVG_HiWord( nwParam ), nlParam } )
RETURN 0
CASE WM_VSCROLL
nReturn := ::handleEvent( HB_GTE_VSCROLL, { Win_LoWord( nwParam ), Win_HiWord( nwParam ), nlParam } )
nReturn := ::handleEvent( HB_GTE_VSCROLL, { WVG_LoWord( nwParam ), WVG_HiWord( nwParam ), nlParam } )
IF nReturn == EVENT_HANDELLED
RETURN 0
ENDIF
@@ -1374,7 +1374,7 @@ METHOD ControlWndProc( hWnd, nMessage, nwParam, nlParam ) CLASS WvgWindow
#endif
END
RETURN Win_CallWindowProc( ::nOldProc, hWnd, nMessage, nwParam, nlParam )
RETURN WVG_CallWindowProc( ::nOldProc, hWnd, nMessage, nwParam, nlParam )
/*----------------------------------------------------------------------*/