From c01c6658865c2399c2348ff2d1fb03e274bc1d11 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 6 Nov 2012 21:27:57 +0000 Subject: [PATCH] 2012-11-06 22:16 UTC+0100 Viktor Szakats (harbour syenar.net) * contrib/hbformat/hbfmtcls.prg * made two code lines more hbformat friendly * contrib/gtwvg/gtwvg.hbx * contrib/xhb/xhb.hbx * fixes * contrib/gtwvg/*.prg * contrib/gtwvg/tests/*.prg * hbformatted. lib code almost fully automatically after adding few code tweaks. --- harbour/ChangeLog | 13 ++++ harbour/contrib/gtwvg/3state.prg | 12 ++-- harbour/contrib/gtwvg/activex.prg | 22 +++---- harbour/contrib/gtwvg/bitmap.prg | 6 +- harbour/contrib/gtwvg/checkbox.prg | 20 +++--- harbour/contrib/gtwvg/class.prg | 84 ++++++++++++------------ harbour/contrib/gtwvg/combobox.prg | 18 ++--- harbour/contrib/gtwvg/dataref.prg | 14 ++-- harbour/contrib/gtwvg/dialog.prg | 16 ++--- harbour/contrib/gtwvg/drawarea.prg | 6 +- harbour/contrib/gtwvg/genrc.prg | 2 +- harbour/contrib/gtwvg/gtwvg.hbx | 12 ++-- harbour/contrib/gtwvg/htmlview.prg | 4 +- harbour/contrib/gtwvg/listbox.prg | 20 +++--- harbour/contrib/gtwvg/menubar.prg | 60 ++++++++--------- harbour/contrib/gtwvg/mle.prg | 14 ++-- harbour/contrib/gtwvg/paint.prg | 66 +++++++++---------- harbour/contrib/gtwvg/parthdlr.prg | 22 +++---- harbour/contrib/gtwvg/pushbut.prg | 12 ++-- harbour/contrib/gtwvg/radiobut.prg | 4 +- harbour/contrib/gtwvg/scrollbr.prg | 48 +++++++------- harbour/contrib/gtwvg/sle.prg | 14 ++-- harbour/contrib/gtwvg/statbar.prg | 12 ++-- harbour/contrib/gtwvg/static.prg | 16 ++--- harbour/contrib/gtwvg/syswnd.prg | 68 +++++++++---------- harbour/contrib/gtwvg/tabpage.prg | 4 +- harbour/contrib/gtwvg/tests/activex.prg | 24 +++---- harbour/contrib/gtwvg/tests/demowvg.prg | 10 +-- harbour/contrib/gtwvg/tests/demowvg1.prg | 20 +++--- harbour/contrib/gtwvg/tests/demoxbp.prg | 16 ++--- harbour/contrib/gtwvg/tests/dyndlgs.prg | 80 +++++++++++----------- harbour/contrib/gtwvg/tests/tbrowser.prg | 6 +- harbour/contrib/gtwvg/tests/utils.prg | 4 +- harbour/contrib/gtwvg/tests/wvtcls.prg | 4 +- harbour/contrib/gtwvg/tests/xbp.prg | 16 ++--- harbour/contrib/gtwvg/toolbar.prg | 32 ++++----- harbour/contrib/gtwvg/treeview.prg | 8 +-- harbour/contrib/hbformat/hbfmtcls.prg | 24 ++++--- harbour/contrib/xhb/xhb.hbx | 4 +- 39 files changed, 428 insertions(+), 409 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 77dddabfb0..3aff128c87 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,19 @@ The license applies to all entries newer than 2009-04-28. */ +2012-11-06 22:16 UTC+0100 Viktor Szakats (harbour syenar.net) + * contrib/hbformat/hbfmtcls.prg + * made two code lines more hbformat friendly + + * contrib/gtwvg/gtwvg.hbx + * contrib/xhb/xhb.hbx + * fixes + + * contrib/gtwvg/*.prg + * contrib/gtwvg/tests/*.prg + * hbformatted. lib code almost fully automatically + after adding few code tweaks. + 2012-11-06 21:38 UTC+0100 Viktor Szakats (harbour syenar.net) * contrib/gtwvg/gtwvg.hbx * cleanups diff --git a/harbour/contrib/gtwvg/3state.prg b/harbour/contrib/gtwvg/3state.prg index 759c2af551..dfb056f7fa 100644 --- a/harbour/contrib/gtwvg/3state.prg +++ b/harbour/contrib/gtwvg/3state.prg @@ -141,7 +141,7 @@ METHOD Wvg3State:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::show() ENDIF - ::editBuffer := WVG_Button_GetCheck( ::hWnd ) + ::editBuffer := Wvg_Button_GetCheck( ::hWnd ) RETURN Self @@ -155,7 +155,7 @@ METHOD Wvg3State:handleEvent( nMessage, aNM ) CASE nMessage == HB_GTE_COMMAND IF aNM[ NMH_code ] == BN_CLICKED - ::editBuffer := WVG_Button_GetCheck( ::hWnd ) + ::editBuffer := Wvg_Button_GetCheck( ::hWnd ) IF HB_ISBLOCK( ::sl_lbClick ) Eval( ::sl_lbClick, ::editBuffer, NIL, self ) @@ -166,13 +166,13 @@ METHOD Wvg3State:handleEvent( nMessage, aNM ) CASE nMessage == HB_GTE_CTLCOLOR IF HB_ISNUMERIC( ::clr_FG ) - WVG_SetTextColor( aNM[ 1 ], ::clr_FG ) + Wvg_SetTextColor( aNM[ 1 ], ::clr_FG ) ENDIF IF HB_ISNUMERIC( ::hBrushBG ) - WVG_SetBkMode( aNM[ 1 ], 1 ) + Wvg_SetBkMode( aNM[ 1 ], 1 ) RETURN ::hBrushBG ELSE - RETURN WVG_GetCurrentBrush( aNM[ 1 ] ) + RETURN Wvg_GetCurrentBrush( aNM[ 1 ] ) ENDIF ENDCASE @@ -203,7 +203,7 @@ METHOD Wvg3State:setCaption( xCaption ) IF HB_ISSTRING( xCaption ) ::caption := xCaption - WVG_SendMessageText( ::hWnd, WM_SETTEXT, 0, ::caption ) + Wvg_SendMessageText( ::hWnd, WM_SETTEXT, 0, ::caption ) ENDIF RETURN Self diff --git a/harbour/contrib/gtwvg/activex.prg b/harbour/contrib/gtwvg/activex.prg index 7a266e2f69..0cc2bee5be 100644 --- a/harbour/contrib/gtwvg/activex.prg +++ b/harbour/contrib/gtwvg/activex.prg @@ -148,7 +148,7 @@ METHOD WvgActiveXControl:Create( oParent, oOwner, aPos, aSize, aPresParams, lVis ::WvgWindow:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) - __defaultNIL( @cCLSID , ::CLSID ) + __defaultNIL( @cCLSID, ::CLSID ) __defaultNIL( @cLicense, ::license ) ::CLSID := cCLSID @@ -161,27 +161,27 @@ METHOD WvgActiveXControl:Create( oParent, oOwner, aPos, aSize, aPresParams, lVis ::hWnd := NIL ::nID := ::oParent:GetControlId() - ::oOLE := Win_OleAuto() + ::oOLE := win_oleAuto() - Win_AxInit() + win_axInit() - hWnd := WAPI_CreateWindowEX( ::exStyle, "AtlAxWin", ::CLSID, ::style, ::aPos[ 1 ], ::aPos[ 2 ], ; - ::aSize[ 1 ], ::aSize[ 2 ], Win_N2P( ::hContainer ), 0 ) + hWnd := wapi_CreateWindowEx( ::exStyle, "AtlAxWin", ::CLSID, ::style, ::aPos[ 1 ], ::aPos[ 2 ], ; + ::aSize[ 1 ], ::aSize[ 2 ], win_N2P( ::hContainer ), 0 ) IF Empty( hWnd ) RETURN NIL ENDIF - ::hWnd := Win_P2N( hWnd ) + ::hWnd := win_P2N( hWnd ) ::pWnd := hWnd - hObj := __AxGetControl( ::pWnd ) + hObj := __axGetControl( ::pWnd ) IF Empty( hObj ) RETURN NIL ENDIF ::oOLE:__hObj := hObj - __AxDoVerb( ::pWnd, -4 ) + __axDoVerb( ::pWnd, -4 ) IF ! Empty( ::hEvents ) - ::oOle:__hSink := __AxRegisterHandler( ::oOle:__hObj, {| nEvent, ... | ::execEvent( nEvent, ... ) } ) + ::oOle:__hSink := __axRegisterHandler( ::oOle:__hObj, {| nEvent, ... | ::execEvent( nEvent, ... ) } ) ENDIF #if 0 @@ -262,8 +262,8 @@ METHOD WvgActiveXControl:OnError() METHOD WvgActiveXControl:Destroy() IF ! Empty( ::oOLE:__hObj ) - IF WAPI_IsWindow( ::pWnd ) - WAPI_DestroyWindow( ::pWnd ) + IF wapi_IsWindow( ::pWnd ) + wapi_DestroyWindow( ::pWnd ) ENDIF ::oOle := NIL ::hWnd := NIL diff --git a/harbour/contrib/gtwvg/bitmap.prg b/harbour/contrib/gtwvg/bitmap.prg index cb152a8389..f250947860 100644 --- a/harbour/contrib/gtwvg/bitmap.prg +++ b/harbour/contrib/gtwvg/bitmap.prg @@ -125,7 +125,7 @@ METHOD new() CLASS WvgBitmap METHOD create( oPScompat ) CLASS WvgBitmap IF oPScompat == NIL - ::hDCComp := WVG_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 - WVG_DeleteObject( ::hBitmap ) + Wvg_DeleteObject( ::hBitmap ) ENDIF IF ::lDCtoDestroy - WVG_ReleaseDC( ::hDCcompat ) + Wvg_ReleaseDC( ::hDCcompat ) ENDIF RETURN Self diff --git a/harbour/contrib/gtwvg/checkbox.prg b/harbour/contrib/gtwvg/checkbox.prg index f6f2b4dec5..b006eaa3fd 100644 --- a/harbour/contrib/gtwvg/checkbox.prg +++ b/harbour/contrib/gtwvg/checkbox.prg @@ -90,8 +90,8 @@ CREATE CLASS WvgCheckBox INHERIT WvgWindow, WvgDataRef METHOD handleEvent( nMessage, aNM ) #if 0 - METHOD editBuffer() INLINE ( WVG_Button_GetCheck( ::hWnd ) == BST_CHECKED ) - METHOD getData() INLINE ( WVG_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, iif( lCheck, BST_CHECKED, BST_UNCHECKED ), 0 ) #endif METHOD setCaption( xCaption ) @@ -136,7 +136,7 @@ METHOD WvgCheckBox:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) IF ::selection ::sendMessage( BM_SETCHECK, BST_CHECKED, 0 ) ENDIF - ::editBuffer := ( WVG_Button_GetCheck( ::hWnd ) == BST_CHECKED ) + ::editBuffer := ( Wvg_Button_GetCheck( ::hWnd ) == BST_CHECKED ) RETURN Self @@ -154,7 +154,7 @@ METHOD WvgCheckBox:handleEvent( nMessage, aNM ) CASE nMessage == HB_GTE_COMMAND IF aNM[ NMH_code ] == BN_CLICKED - ::editBuffer := ( WVG_Button_GetCheck( ::hWnd ) == BST_CHECKED ) + ::editBuffer := ( Wvg_Button_GetCheck( ::hWnd ) == BST_CHECKED ) IF HB_ISBLOCK( ::sl_lbClick ) IF ::isParentCrt() ::oParent:setFocus() @@ -168,13 +168,13 @@ METHOD WvgCheckBox:handleEvent( nMessage, aNM ) CASE nMessage == HB_GTE_CTLCOLOR IF HB_ISNUMERIC( ::clr_FG ) - WVG_SetTextColor( aNM[ 1 ], ::clr_FG ) + Wvg_SetTextColor( aNM[ 1 ], ::clr_FG ) ENDIF IF HB_ISNUMERIC( ::hBrushBG ) - WVG_SetBkMode( aNM[ 1 ], 1 ) + Wvg_SetBkMode( aNM[ 1 ], 1 ) RETURN ::hBrushBG ELSE - RETURN WVG_GetCurrentBrush( aNM[ 1 ] ) + RETURN Wvg_GetCurrentBrush( aNM[ 1 ] ) ENDIF #if 0 /* This should never be reached as parent is processing the events */ @@ -183,8 +183,8 @@ METHOD WvgCheckBox:handleEvent( nMessage, aNM ) IF aNM[ 1 ] == WM_LBUTTONUP IF HB_ISBLOCK( ::sl_lbClick ) ::oParent:setFocus() - ::sendMessage( BM_SETCHECK, iif( WVG_Button_GetCheck( ::hWnd ) == BST_CHECKED, BST_UNCHECKED, BST_CHECKED ), 0 ) - ::editBuffer := ( WVG_Button_GetCheck( ::hWnd ) == BST_CHECKED ) + ::sendMessage( BM_SETCHECK, iif( Wvg_Button_GetCheck( ::hWnd ) == BST_CHECKED, BST_UNCHECKED, BST_CHECKED ), 0 ) + ::editBuffer := ( Wvg_Button_GetCheck( ::hWnd ) == BST_CHECKED ) Eval( ::sl_lbClick, NIL, NIL, Self ) ENDIF ENDIF @@ -217,7 +217,7 @@ METHOD WvgCheckBox:setCaption( xCaption ) IF HB_ISSTRING( xCaption ) ::caption := xCaption - WVG_SendMessageText( ::hWnd, WM_SETTEXT, 0, ::caption ) + Wvg_SendMessageText( ::hWnd, WM_SETTEXT, 0, ::caption ) ENDIF RETURN Self diff --git a/harbour/contrib/gtwvg/class.prg b/harbour/contrib/gtwvg/class.prg index 71419e9038..39c531a58a 100644 --- a/harbour/contrib/gtwvg/class.prg +++ b/harbour/contrib/gtwvg/class.prg @@ -225,9 +225,9 @@ METHOD wvtDialog:New( nRows, nCols, cTitle, cFont, nFontHeight, nFontWidth, nFon ::oldMenuHandle := Wvt_GetMenu() ::oldMenuBlock := SetKey( Wvt_SetMenuKeyEvent() ) - ::oldTooltipWidth := Wvt_GetTooltipWidth() - ::oldTooltipBkColor := Wvt_GetTooltipBkColor() - ::oldTooltipTextColor := Wvt_GetTooltipTextColor() + ::oldTooltipWidth := Wvt_GetToolTipWidth() + ::oldTooltipBkColor := Wvt_GetToolTipBKColor() + ::oldTooltipTextColor := Wvt_GetToolTipTextColor() ::nRows := nRows ::nCols := nCols @@ -243,7 +243,7 @@ METHOD wvtDialog:New( nRows, nCols, cTitle, cFont, nFontHeight, nFontWidth, nFon ::nKey := 0 ::cColor := "N/W" ::nUseObj := 0 - ::lGui := Wvt_SetGui( .F. ) + ::lGui := Wvt_SetGUI( .F. ) RETURN Self @@ -255,13 +255,13 @@ METHOD wvtDialog:Create() ::oldToolTipActive := Wvt_SetToolTipActive( .T. ) IF ::nTooltipWidth != nil - Wvt_setTooltipWidth( ::nTooltipWidth ) + Wvt_SetToolTipWidth( ::nTooltipWidth ) ENDIF IF ::nTooltipBkColor != nil - Wvt_SetTooltipBkColor( ::nTooltipBkColor ) + Wvt_SetToolTipBkColor( ::nTooltipBkColor ) ENDIF IF ::nTooltipTextColor != nil - Wvt_SetTooltipTextColor( ::nTooltipTextColor ) + Wvt_SetToolTipTextColor( ::nTooltipTextColor ) ENDIF aPalette := Wvt_GetPalette() @@ -297,12 +297,12 @@ METHOD wvtDialog:Create() FOR i := 1 TO Len( ::aObjects ) IF ! Empty( ::aObjects[ i ]:aPaint ) FOR j := 1 TO Len( ::aObjects[ i ]:aPaint ) - wvg_SetPaint( ::cPaintBlockID, ::nPaintID++, ; + Wvg_SetPaint( ::cPaintBlockID, ::nPaintID++, ; ::aObjects[ i ]:aPaint[ j, 1 ], ::aObjects[ i ]:aPaint[ j, 2 ] ) NEXT ENDIF NEXT - WvtSetPaint( wvg_GetPaint( ::cPaintBlockID ) ) + WvtSetPaint( Wvg_GetPaint( ::cPaintBlockID ) ) IF AScan( ::aObjects, {| o | o:lTabStop } ) > 0 ::lTabStops := .T. @@ -328,11 +328,11 @@ METHOD wvtDialog:Destroy() AEval( ::aObjects, {| o | o:destroy() } ) - Wvt_SetTooltip( 0, 0, 0, 0, "" ) - Wvt_SetTooltipActive( ::oldToolTipActive ) - Wvt_setTooltipWidth( ::oldTooltipWidth ) - Wvt_SetTooltipBkColor( ::oldTooltipBkColor ) - Wvt_SetTooltipTextColor( ::oldTooltipTextColor ) + Wvt_SetToolTip( 0, 0, 0, 0, "" ) + Wvt_SetToolTipActive( ::oldToolTipActive ) + Wvt_SetToolTipWidth( ::oldTooltipWidth ) + Wvt_SetToolTipBkColor( ::oldTooltipBkColor ) + Wvt_SetToolTipTextColor( ::oldTooltipTextColor ) /* Here set mode is before setting the font */ SetMode( ::nOldRows, ::nOldCols ) @@ -351,9 +351,9 @@ METHOD wvtDialog:Destroy() SetKey( Wvt_SetMenuKeyEvent(), ::oldMenuBlock ) RestScreen( 0, 0, MaxRow(), MaxCol(), ::cScreen ) Wvt_RestScreen( 0, 0, MaxRow(), MaxCol(), ::aWvtScreen ) - wvg_PurgePaint( ::cPaintBlockID ) + Wvg_PurgePaint( ::cPaintBlockID ) WvtSetPaint( ::aOldPnt ) - Wvt_SetGui( ::lGui ) + Wvt_SetGUI( ::lGui ) RETURN NIL @@ -495,13 +495,13 @@ METHOD wvtDialog:Inkey() ENDIF IF ::nObjOver == 0 - Wvt_SetTooltip( 0, 0, 0, 0, "" ) + Wvt_SetToolTip( 0, 0, 0, 0, "" ) ELSEIF ::oObjOver:lActive ::oObjOver:SetTooltip() ELSE - Wvt_SetTooltip( 0, 0, 0, 0, "" ) + Wvt_SetToolTip( 0, 0, 0, 0, "" ) ENDIF ENDIF @@ -949,7 +949,7 @@ METHOD WvtObject:Create() METHOD WvtObject:Destroy() IF ::hFont != nil - WVG_DeleteObject( ::hFont ) + Wvg_DeleteObject( ::hFont ) ::hFont := nil ENDIF @@ -967,7 +967,7 @@ METHOD WvtObject:CreatePopup() LOCAL i, nID IF ! Empty( ::aPopup ) .AND. ::hPopup == nil - ::hPopup := Wvt_CreatePopupMenu() + ::hPopup := Wvt_CreatePOPUPMenu() FOR i := 1 TO Len( ::aPopup ) @@ -1064,7 +1064,7 @@ METHOD WvtBrowse:Create() ::nTop := ::oBrw:nTop - 2 ::nLeft := ::oBrw:nLeft - 2 ::nBottom := iif( ::lHSBar, ::oBrw:nBottom, ::oBrw:nBottom + 1 ) - ::nRight := iif( ::lVSBar, ::oBrw:nRight , ::oBrw:nRight + 2 ) + ::nRight := iif( ::lVSBar, ::oBrw:nRight, ::oBrw:nRight + 2 ) #else ::nTop := ::oBrw:nTop ::nLeft := ::oBrw:nLeft @@ -1078,11 +1078,11 @@ METHOD WvtBrowse:Create() ::Super:Create() - __defaultNIL( @::bTotalRecords , {|| ( ::cAlias )->( ordKeyCount() ) } ) + __defaultNIL( @::bTotalRecords, {|| ( ::cAlias )->( ordKeyCount() ) } ) __defaultNIL( @::bCurrentRecord, {|| ( ::cAlias )->( ordKeyNo() ) } ) ::SetVBar() - __defaultNIL( @::bTotalColumns , {|| ::oBrw:ColCount } ) + __defaultNIL( @::bTotalColumns, {|| ::oBrw:ColCount } ) __defaultNIL( @::bCurrentColumn, {|| ::oBrw:ColPos } ) ::SetHBar() @@ -1260,7 +1260,7 @@ METHOD WvtBrowse:SetTooltip() ::Tooltip := cTip ENDIF - Wvt_SetTooltip( ::nTop, ::nLeft, ::nBottom, ::nRight, ::Tooltip ) + Wvt_SetToolTip( ::nTop, ::nLeft, ::nBottom, ::nRight, ::Tooltip ) RETURN Self @@ -1346,10 +1346,10 @@ ENDCLASS METHOD WvtStatusBar:New( oParent, nID, nTop, nLeft, nBottom, nRight ) - __defaultNIL( @nTop , oParent:MaxRow() ) - __defaultNIL( @nLeft , 0 ) + __defaultNIL( @nTop, oParent:MaxRow() ) + __defaultNIL( @nLeft, 0 ) __defaultNIL( @nBottom, oParent:MaxRow() ) - __defaultNIL( @nRight , oParent:MaxCol() ) + __defaultNIL( @nRight, oParent:MaxCol() ) ::Super:New( oParent, DLG_OBJ_STATUSBAR, nID, nTop, nLeft, nBottom, nRight ) @@ -1554,10 +1554,10 @@ METHOD WvtLabel:New( oParent, nID, nTop, nLeft, nBottom, nRight ) METHOD WvtLabel:Create( lConfg ) - __defaultNIL( @lConfg , .F. ) + __defaultNIL( @lConfg, .F. ) - __defaultNIL( @::nBottom , ::nTop ) - __defaultNIL( @::nRight , ::nLeft + Len( ::Text ) ) + __defaultNIL( @::nBottom, ::nTop ) + __defaultNIL( @::nRight, ::nLeft + Len( ::Text ) ) __defaultNIL( @::nTextColor, RGB( 0, 0, 0 ) ) ::nTextColorHoverOff := ::nTextColor @@ -1628,7 +1628,7 @@ METHOD WvtLabel:Configure() ::nBackColorHoverOff := ::nBackColor IF ::hFont != 0 - WVG_DeleteObject( ::hFont ) + Wvg_DeleteObject( ::hFont ) ENDIF ::hFont := Wvt_CreateFont( ::cFont, ::nFontHeight, ::nFontWidth, ::nFontWeight, ::lItalic, ; @@ -2460,7 +2460,7 @@ CREATE CLASS WvtScrollBar FROM WvtObject METHOD Configure( nTop, nLeft, nBottom, nRight ) METHOD Refresh() METHOD HandleEvent( nKey ) - METHOD setPos( nTotal, nCurrent ) + METHOD SetPos( nTotal, nCurrent ) METHOD GetPos() METHOD ThumbPos() METHOD SetTooltip() @@ -2651,9 +2651,9 @@ METHOD wvtScrollbar:Refresh() // -METHOD wvtScrollbar:setPos( nTotal, nCurrent ) +METHOD wvtScrollbar:SetPos( nTotal, nCurrent ) - __defaultNIL( @nTotal , Eval( ::bTotal ) ) + __defaultNIL( @nTotal, Eval( ::bTotal ) ) __defaultNIL( @nCurrent, Eval( ::bCurrent ) ) ::nTotal := nTotal @@ -2768,7 +2768,7 @@ METHOD wvtScrollbar:HandleEvent( nKey ) ::nCurrent := 1 ENDIF - ::setPos( ::nTotal, ::nCurrent ) + ::SetPos( ::nTotal, ::nCurrent ) ::SetTooltip() Wvt_Keyboard( K_SBTHUMBTRACKVERT ) @@ -2866,7 +2866,7 @@ METHOD wvtScrollbar:HandleEvent( nKey ) ::nCurrent := 1 ENDIF - ::setPos( ::nTotal, ::nCurrent ) + ::SetPos( ::nTotal, ::nCurrent ) Wvt_Keyboard( K_SBTHUMBTRACKHORZ ) ENDIF @@ -3027,7 +3027,7 @@ METHOD WvtBanner:Create() METHOD WvtBanner:Destroy() - WVG_DeleteObject( ::oLabel:hFont ) + Wvg_DeleteObject( ::oLabel:hFont ) RETURN NIL @@ -3261,10 +3261,10 @@ METHOD WvtProgressBar:New( oParent, nID, nTop, nLeft, nBottom, nRight ) METHOD WvtProgressBar:Create() - __defaultNIL( @::nTop , 0 ) - __defaultNIL( @::nLeft , 0 ) - __defaultNIL( @::nBottom , iif( ::lVertical, ::nTop + 9, ::nTop ) ) - __defaultNIL( @::nRight , iif( ::lVertical, ::nLeft + 1, ::nLeft + 19 ) ) + __defaultNIL( @::nTop, 0 ) + __defaultNIL( @::nLeft, 0 ) + __defaultNIL( @::nBottom, iif( ::lVertical, ::nTop + 9, ::nTop ) ) + __defaultNIL( @::nRight, iif( ::lVertical, ::nLeft + 1, ::nLeft + 19 ) ) __defaultNIL( @::nTextColor, RGB( 255, 255, 255 ) ) __defaultNIL( @::nBackColor, RGB( 198, 198, 198 ) ) @@ -3284,7 +3284,7 @@ METHOD WvtProgressBar:Display( nCurrent, nTotal ) ENDIF __defaultNIL( @nCurrent, ::nCurrent ) - __defaultNIL( @nTotal , ::nTotal ) + __defaultNIL( @nTotal, ::nTotal ) ::nCurrent := nCurrent ::nTotal := nTotal diff --git a/harbour/contrib/gtwvg/combobox.prg b/harbour/contrib/gtwvg/combobox.prg index 5790366652..920ae5e661 100644 --- a/harbour/contrib/gtwvg/combobox.prg +++ b/harbour/contrib/gtwvg/combobox.prg @@ -90,7 +90,7 @@ CREATE CLASS WvgComboBox INHERIT WvgWindow, WvgDataRef METHOD destroy() METHOD handleEvent( nMessage, aNM ) - METHOD sendCBMessage( nMsg, wParam, lParam ) INLINE WVG_SendCBMessage( ::pWnd, nMsg, wParam, lParam ) + METHOD sendCBMessage( nMsg, wParam, lParam ) INLINE Wvg_SendCBMessage( ::pWnd, nMsg, wParam, lParam ) METHOD listBoxFocus( lFocus ) METHOD listBoxSize() METHOD sleSize() @@ -125,7 +125,9 @@ METHOD WvgComboBox:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::wvgWindow:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::style := WS_CHILD + WS_TABSTOP + WS_BORDER + WS_VSCROLL + CBS_NOINTEGRALHEIGHT + CBS_AUTOHSCROLL -//::exStyle := WS_EX_CLIENTEDGE +#if 0 + ::exStyle := WS_EX_CLIENTEDGE +#endif ::className := "COMBOBOX" ::objType := objTypeComboBox @@ -164,12 +166,12 @@ METHOD WvgComboBox:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::oSLE := WvgSLE():new() ::oSLE:oParent := Self ::oSLE:hWnd := ::aInfo[ 5 ] - ::oSLE:pWnd := Win_N2P( ::aInfo[ 5 ] ) + ::oSLE:pWnd := win_N2P( ::aInfo[ 5 ] ) ::oListBox := WvgListBox():new() ::oListBox:oParent := Self ::oListBox:hWnd := ::aInfo[ 6 ] - ::oListBox:pWnd := Win_N2P( ::aInfo[ 6 ] ) + ::oListBox:pWnd := win_N2P( ::aInfo[ 6 ] ) ENDIF RETURN Self @@ -213,7 +215,7 @@ METHOD WvgComboBox:handleEvent( nMessage, aNM ) CASE nMessage == HB_GTE_COMMAND IF aNM[ 1 ] == CBN_SELCHANGE - ::nCurSelected := ::editBuffer := WVG_LBGetCurSel( ::hWnd ) + 1 + ::nCurSelected := ::editBuffer := Wvg_LBGetCurSel( ::hWnd ) + 1 IF ::isParentCrt() ::oParent:setFocus() ENDIF @@ -259,13 +261,13 @@ METHOD WvgComboBox:handleEvent( nMessage, aNM ) CASE nMessage == HB_GTE_CTLCOLOR IF HB_ISNUMERIC( ::clr_FG ) - WVG_SetTextColor( aNM[ 1 ], ::clr_FG ) + Wvg_SetTextColor( aNM[ 1 ], ::clr_FG ) ENDIF IF HB_ISNUMERIC( ::hBrushBG ) - WVG_SetBkMode( aNM[ 1 ], 1 ) + Wvg_SetBkMode( aNM[ 1 ], 1 ) RETURN ::hBrushBG ELSE - RETURN WVG_GetCurrentBrush( aNM[ 1 ] ) + RETURN Wvg_GetCurrentBrush( aNM[ 1 ] ) ENDIF ENDCASE diff --git a/harbour/contrib/gtwvg/dataref.prg b/harbour/contrib/gtwvg/dataref.prg index 7f0d25bdce..0e922b67c2 100644 --- a/harbour/contrib/gtwvg/dataref.prg +++ b/harbour/contrib/gtwvg/dataref.prg @@ -122,10 +122,10 @@ METHOD WvgDataRef:getData() ENDIF CASE ::className == "EDIT" - ::sl_editBuffer := WVG_GetMessageText( ::hWnd, WM_GETTEXT, ::bufferLength + 1 ) + ::sl_editBuffer := Wvg_GetMessageText( ::hWnd, WM_GETTEXT, ::bufferLength + 1 ) CASE ::className == "LISTBOX" - ::sl_editBuffer := WVG_LBGetCurSel( ::hWnd ) + 1 + ::sl_editBuffer := Wvg_LBGetCurSel( ::hWnd ) + 1 #if 0 /* This is contrary the documentation of Xbase++ */ IF ::oParent:className == "COMBOBOX" @@ -134,7 +134,7 @@ METHOD WvgDataRef:getData() AAdd( ::sl_editBuffer, ::getItem( i ) ) NEXT ELSE - ::sl_editBuffer := WVG_LBGetCurSel( ::hWnd ) + 1 + ::sl_editBuffer := Wvg_LBGetCurSel( ::hWnd ) + 1 ENDIF #endif ENDCASE @@ -166,22 +166,22 @@ METHOD WvgDataRef:setData( xValue, mp2 ) CASE ::className == "LISTBOX" /* Single Selection */ IF HB_ISNUMERIC( ::sl_editBuffer ) - RETURN WVG_LBSetCurSel( ::hWnd, ::sl_editBuffer - 1 ) >= 0 + RETURN Wvg_LBSetCurSel( ::hWnd, ::sl_editBuffer - 1 ) >= 0 ENDIF CASE ::className == "SysTreeView32" IF ::sl_editBuffer != NIL .AND. ::sl_editBuffer:hItem != NIL - WVG_TreeView_SelectItem( ::hWnd, ::sl_editBuffer:hItem ) + Wvg_TreeView_SelectItem( ::hWnd, ::sl_editBuffer:hItem ) ENDIF CASE ::className == "EDIT" IF HB_ISSTRING( ::sl_editBuffer ) - WVG_SendMessageText( ::hWnd, WM_SETTEXT, 0, ::sl_editBuffer ) + Wvg_SendMessageText( ::hWnd, WM_SETTEXT, 0, ::sl_editBuffer ) ENDIF CASE ::className == "SCROLLBAR" IF ::sl_editBuffer != NIL - WAPI_SetScrollPos( ::pWnd, SB_CTL, ::sl_editBuffer, .T. ) + wapi_SetScrollPos( ::pWnd, SB_CTL, ::sl_editBuffer, .T. ) ENDIF CASE ::className == "COMBOBOX" diff --git a/harbour/contrib/gtwvg/dialog.prg b/harbour/contrib/gtwvg/dialog.prg index 87b443bcfc..eb1aa343d5 100644 --- a/harbour/contrib/gtwvg/dialog.prg +++ b/harbour/contrib/gtwvg/dialog.prg @@ -94,9 +94,9 @@ CREATE CLASS WvgDialog FROM WvgWindow METHOD showModal() INLINE NIL METHOD setTitle( cTitle ) INLINE ::title := cTitle, hb_gtInfo( HB_GTI_WINTITLE, cTitle ) METHOD getTitle() INLINE hb_gtInfo( HB_GTI_WINTITLE ) - METHOD calcClientRect() INLINE ::aRect := WVG_GetClientRect( ::hWnd ), ; + METHOD calcClientRect() INLINE ::aRect := Wvg_GetClientRect( ::hWnd ), ; { 0, 0, ::aRect[ 3 ], ::aRect[ 4 ] } - METHOD calcFrameRect() INLINE ::aRect := WVG_GetWindowRect( ::hWnd ), ; + METHOD calcFrameRect() INLINE ::aRect := Wvg_GetWindowRect( ::hWnd ), ; { ::aRect[ 1 ], ::aRect[ 2 ], ; ::aRect[ 3 ] - ::aRect[ 1 ], ::aRect[ 4 ] - ::aRect[ 2 ] } @@ -144,9 +144,9 @@ METHOD WvgDialog:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::hWnd := hb_gtInfo( HB_GTI_SPEC, HB_GTS_WINDOWHANDLE ) - hb_gtInfo( HB_GTI_RESIZABLE , ::resizable ) - hb_gtInfo( HB_GTI_CLOSABLE , ::closable ) - hb_gtInfo( HB_GTI_WINTITLE , ::title ) + hb_gtInfo( HB_GTI_RESIZABLE, ::resizable ) + hb_gtInfo( HB_GTI_CLOSABLE, ::closable ) + hb_gtInfo( HB_GTI_WINTITLE, ::title ) IF ! Empty( ::icon ) IF HB_ISNUMERIC( ::icon ) @@ -198,7 +198,7 @@ METHOD WvgDialog:destroy() ENDIF IF ! Empty( ::hBrushBG ) - WVG_DeleteObject( ::hBrushBG ) + Wvg_DeleteObject( ::hBrushBG ) ENDIF ::pGT := NIL @@ -231,10 +231,10 @@ METHOD WvgDialog:setFrameState( nState ) METHOD WvgDialog:getFrameState() - IF WVG_IsIconic( ::hWnd ) + IF Wvg_IsIconic( ::hWnd ) RETURN WVGDLG_FRAMESTAT_MINIMIZED ENDIF - IF WVG_IsZoomed( ::hWnd ) + IF Wvg_IsZoomed( ::hWnd ) RETURN WVGDLG_FRAMESTAT_MAXIMIZED ENDIF diff --git a/harbour/contrib/gtwvg/drawarea.prg b/harbour/contrib/gtwvg/drawarea.prg index 89b8cdaf36..d1765be3e8 100644 --- a/harbour/contrib/gtwvg/drawarea.prg +++ b/harbour/contrib/gtwvg/drawarea.prg @@ -136,11 +136,11 @@ METHOD WvgDrawingArea:handleEvent( nMessage, aNM ) CASE nMessage == HB_GTE_CTLCOLOR IF HB_ISNUMERIC( ::clr_FG ) - WVG_SetTextColor( aNM[ 1 ], ::clr_FG ) + Wvg_SetTextColor( aNM[ 1 ], ::clr_FG ) ENDIF IF HB_ISNUMERIC( ::hBrushBG ) - WVG_SetBkMode( aNM[ 1 ], 1 ) - WVG_FillRect( aNM[ 1 ], { 0, 0, ::currentSize()[ 1 ], ::currentSize()[ 2 ] }, ::hBrushBG ) + Wvg_SetBkMode( aNM[ 1 ], 1 ) + Wvg_FillRect( aNM[ 1 ], { 0, 0, ::currentSize()[ 1 ], ::currentSize()[ 2 ] }, ::hBrushBG ) RETURN EVENT_HANDELLED ENDIF diff --git a/harbour/contrib/gtwvg/genrc.prg b/harbour/contrib/gtwvg/genrc.prg index 40095632cd..8d427070b9 100644 --- a/harbour/contrib/gtwvg/genrc.prg +++ b/harbour/contrib/gtwvg/genrc.prg @@ -99,7 +99,7 @@ FUNCTION WvgSetAppWindow( oCrt ) IF Empty( t_oCrt ) t_oCrt := WvgCrt():new() t_oCrt:hWnd := Wvt_GetWindowHandle() - t_oCrt:pWnd := Win_N2P( t_oCrt:hWnd ) + t_oCrt:pWnd := win_N2P( t_oCrt:hWnd ) hb_gtInfo( HB_GTI_NOTIFIERBLOCKGUI, {| nEvent, ... | t_oCrt:notifier( nEvent, ... ) } ) t_oCrt:isGT := .T. RETURN t_oCrt diff --git a/harbour/contrib/gtwvg/gtwvg.hbx b/harbour/contrib/gtwvg/gtwvg.hbx index dacc2656de..83d647315a 100644 --- a/harbour/contrib/gtwvg/gtwvg.hbx +++ b/harbour/contrib/gtwvg/gtwvg.hbx @@ -43,7 +43,7 @@ DYNAMIC WvgHtmlViewer DYNAMIC WvgListBox DYNAMIC WvgMenu DYNAMIC WvgMenuBar -DYNAMIC WvgMle +DYNAMIC WvgMLE DYNAMIC WvgPartHandler DYNAMIC WvgPushButton DYNAMIC WvgRadioButton @@ -60,7 +60,7 @@ DYNAMIC WvgToolBarButton DYNAMIC WvgTreeView DYNAMIC WvgTreeViewItem DYNAMIC WvgWindow -DYNAMIC Wvg_AddToolbarButton +DYNAMIC Wvg_AddToolBarButton DYNAMIC Wvg_And DYNAMIC Wvg_AppendMenu DYNAMIC Wvg_BeginMouseTracking @@ -111,7 +111,7 @@ DYNAMIC Wvg_GetDialogBaseUnits DYNAMIC Wvg_GetDlgItem DYNAMIC Wvg_GetDlgItemText DYNAMIC Wvg_GetFocus -DYNAMIC Wvg_GetMessagetExt +DYNAMIC Wvg_GetMessageText DYNAMIC Wvg_GetNMHdrInfo DYNAMIC Wvg_GetNMMouseInfo DYNAMIC Wvg_GetNMTreeViewInfo @@ -168,7 +168,7 @@ DYNAMIC Wvg_SendCBMessage DYNAMIC Wvg_SendDlgItemMessage DYNAMIC Wvg_SendEditControlMessage DYNAMIC Wvg_SendMessage -DYNAMIC Wvg_SendMessagetExt +DYNAMIC Wvg_SendMessageText DYNAMIC Wvg_SendToolBarMessage DYNAMIC Wvg_SetBkColor DYNAMIC Wvg_SetBkMode @@ -297,7 +297,7 @@ DYNAMIC Wvt_GetOpenFilename DYNAMIC Wvt_GetPaintRect DYNAMIC Wvt_GetPalette DYNAMIC Wvt_GetRGBColor -DYNAMIC Wvt_GetRGBColorBYString +DYNAMIC Wvt_GetRGBColorByString DYNAMIC Wvt_GetSaveFilename DYNAMIC Wvt_GetScreenHeight DYNAMIC Wvt_GetScreenWidth @@ -326,7 +326,7 @@ DYNAMIC Wvt_MessageBox DYNAMIC Wvt_Minimize DYNAMIC Wvt_PasteFromClipboard DYNAMIC Wvt_ProcessMessages -DYNAMIC Wvt_RESetWindow +DYNAMIC Wvt_ResetWindow DYNAMIC Wvt_RestScreen DYNAMIC Wvt_SaveScreen DYNAMIC Wvt_SetAltF4Close diff --git a/harbour/contrib/gtwvg/htmlview.prg b/harbour/contrib/gtwvg/htmlview.prg index 1ca6592c40..ff9fd14c2e 100644 --- a/harbour/contrib/gtwvg/htmlview.prg +++ b/harbour/contrib/gtwvg/htmlview.prg @@ -164,9 +164,9 @@ METHOD WvgHTMLViewer:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ::mapEvent( evNavigateComplete, {| cURL | ::xNavigateComplete( cURL ) } ) - ::mapEvent( evProgressChange , {| nProgress, nProgMax | ::xProgressChange( nProgress, nProgMax ) } ) + ::mapEvent( evProgressChange, {| nProgress, nProgMax | ::xProgressChange( nProgress, nProgMax ) } ) - ::mapEvent( evTitleChange , {| cTitle | ::xTitleChange( cTitle ) } ) + ::mapEvent( evTitleChange, {| cTitle | ::xTitleChange( cTitle ) } ) ::mapEvent( evDocumentComplete, {| cURI | ::xDocumentComplete( cURI ) } ) diff --git a/harbour/contrib/gtwvg/listbox.prg b/harbour/contrib/gtwvg/listbox.prg index cfe0c5f4d8..d6db19419d 100644 --- a/harbour/contrib/gtwvg/listbox.prg +++ b/harbour/contrib/gtwvg/listbox.prg @@ -99,12 +99,12 @@ CREATE CLASS WvgListBox INHERIT WvgWindow, WvgDataRef METHOD setItemsHeight( nPixel ) INLINE ::sendMessage( LB_SETITEMHEIGHT, 0, nPixel ) METHOD setTopItem( nIndex ) INLINE ::sendMessage( LB_SETTOPINDEX, nIndex - 1, 0 ) - METHOD addItem( cItem ) INLINE WVG_SendMessageText( ::hWnd, LB_ADDSTRING, 0, cItem ) + METHOD addItem( cItem ) INLINE Wvg_SendMessageText( ::hWnd, LB_ADDSTRING, 0, cItem ) METHOD CLEAR() METHOD delItem( nIndex ) INLINE ::sendMessage( LB_DELETESTRING, nIndex - 1, 0 ) - METHOD getItem( nIndex ) INLINE WVG_LBGetText( ::hWnd, nIndex - 1 ) + METHOD getItem( nIndex ) INLINE Wvg_LBGetText( ::hWnd, nIndex - 1 ) METHOD getTabstops() VIRTUAL - METHOD insItem( nIndex, cItem ) INLINE WVG_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 @@ -196,7 +196,7 @@ METHOD WvgListBox:handleEvent( nMessage, aNM ) CASE nMessage == HB_GTE_COMMAND IF aNM[ 1 ] == LBN_SELCHANGE - ::nCurSelected := WVG_LBGetCurSel( ::hWnd ) + 1 + ::nCurSelected := Wvg_LBGetCurSel( ::hWnd ) + 1 IF ::isParentCrt() ::oParent:setFocus() ENDIF @@ -250,18 +250,18 @@ METHOD WvgListBox:handleEvent( nMessage, aNM ) CASE nMessage == HB_GTE_CTLCOLOR IF HB_ISNUMERIC( ::clr_FG ) - WVG_SetTextColor( aNM[ 1 ], ::clr_FG ) + Wvg_SetTextColor( aNM[ 1 ], ::clr_FG ) ENDIF IF HB_ISNUMERIC( ::hBrushBG ) - WVG_SetBkMode( aNM[ 1 ], 1 ) + Wvg_SetBkMode( aNM[ 1 ], 1 ) RETURN ::hBrushBG ELSE - RETURN WVG_GetCurrentBrush( aNM[ 1 ] ) + RETURN Wvg_GetCurrentBrush( aNM[ 1 ] ) ENDIF CASE nMessage == HB_GTE_ANY /* This will never be reached */ IF aNM[ 1 ] == WM_LBUTTONUP - ::nCurSelected := WVG_LBGetCurSel( ::hWnd ) + 1 + ::nCurSelected := Wvg_LBGetCurSel( ::hWnd ) + 1 IF HB_ISBLOCK( ::sl_itemMarked ) IF ::isParentCrt() ::oParent:setFocus() @@ -286,8 +286,8 @@ METHOD WvgListBox:handleEvent( nMessage, aNM ) ENDIF ELSEIF aNM[ 1 ] == WM_KEYUP - IF ::nCurSelected != WVG_LBGetCurSel( ::hWnd ) + 1 - ::nCurSelected := WVG_LBGetCurSel( ::hWnd ) + 1 + IF ::nCurSelected != Wvg_LBGetCurSel( ::hWnd ) + 1 + ::nCurSelected := Wvg_LBGetCurSel( ::hWnd ) + 1 IF HB_ISBLOCK( ::sl_itemMarked ) IF ::isParentCrt() ::oParent:setFocus() diff --git a/harbour/contrib/gtwvg/menubar.prg b/harbour/contrib/gtwvg/menubar.prg index f7116283fe..b4087aa065 100644 --- a/harbour/contrib/gtwvg/menubar.prg +++ b/harbour/contrib/gtwvg/menubar.prg @@ -141,9 +141,9 @@ ENDCLASS METHOD WvgMenuBar:new( oParent, aPresParams, lVisible ) - __defaultNIL( @oParent , ::oParent ) + __defaultNIL( @oParent, ::oParent ) __defaultNIL( @aPresParams, ::aPresParams ) - __defaultNIL( @lVisible , ::visible ) + __defaultNIL( @lVisible, ::visible ) ::oParent := oParent ::aPresParams := aPresParams @@ -157,9 +157,9 @@ METHOD WvgMenuBar:new( oParent, aPresParams, lVisible ) METHOD WvgMenuBar:create( oParent, aPresParams, lVisible ) - __defaultNIL( @oParent , ::oParent ) + __defaultNIL( @oParent, ::oParent ) __defaultNIL( @aPresParams, ::aPresParams ) - __defaultNIL( @lVisible , ::visible ) + __defaultNIL( @lVisible, ::visible ) ::oParent := oParent ::aPresParams := aPresParams @@ -167,7 +167,7 @@ METHOD WvgMenuBar:create( oParent, aPresParams, lVisible ) ::wvgWindow:create( ::oParent, , , , ::aPresParams, ::visible ) - ::hMenu := WVG_CreateMenu() + ::hMenu := Wvg_CreateMenu() IF ::hMenu != 0 /* check for if the parent already has a menu @@ -176,20 +176,20 @@ METHOD WvgMenuBar:create( oParent, aPresParams, lVisible ) */ /* finally set the menu */ #if 0 - WVG_SetMenu( ::oParent:getHWND(), ::hMenu ) + Wvg_SetMenu( ::oParent:getHWND(), ::hMenu ) #endif /* how to make menu invisible ? */ IF ( ::visible ) #if 0 - WVG_ShowWindow( ::oParent:getHWND(), SW_MINIMIZE ) - WVG_ShowWindow( ::oParent:getHWND(), SW_NORMAL ) + Wvg_ShowWindow( ::oParent:getHWND(), SW_MINIMIZE ) + Wvg_ShowWindow( ::oParent:getHWND(), SW_NORMAL ) #endif ENDIF ::oParent:oMenu := Self - ::pMenu := WIN_N2P( ::hMenu ) + ::pMenu := win_N2P( ::hMenu ) ENDIF RETURN Self @@ -198,9 +198,9 @@ METHOD WvgMenuBar:create( oParent, aPresParams, lVisible ) METHOD WvgMenuBar:configure( oParent, aPresParams, lVisible ) - __defaultNIL( @oParent , ::oParent ) + __defaultNIL( @oParent, ::oParent ) __defaultNIL( @aPresParams, ::aPresParams ) - __defaultNIL( @lVisible , ::visible ) + __defaultNIL( @lVisible, ::visible ) ::oParent := oParent ::aPresParams := aPresParams @@ -215,7 +215,7 @@ METHOD WvgMenuBar:destroy() IF ! Empty( ::hMenu ) ::DelAllItems() - IF ! WVG_DestroyMenu( ::hMenu ) + IF ! Wvg_DestroyMenu( ::hMenu ) #if 0 Throw( ErrorNew( "wvtMenu", 1000, "wvtMenu:Destroy()", "Destroy menu FAILED", {}, __FILE__ ) ) #endif @@ -251,7 +251,7 @@ METHOD WvgMenuBar:delItem( nItemNum ) ::aMenuItems[ nItemNum, WVT_MENU_MENUOBJ ]:Destroy() ENDIF - IF ( lResult := WVG_DeleteMenu( ::hMenu, nItemNum - 1, MF_BYPOSITION ) ) /* Remember ZERO base */ + IF ( lResult := Wvg_DeleteMenu( ::hMenu, nItemNum - 1, MF_BYPOSITION ) ) /* Remember ZERO base */ hb_ADel( ::aMenuItems, nItemNum, .T. ) ELSE #if 0 @@ -330,7 +330,7 @@ METHOD WvgMenuBar:putItem( aItem, nPos, lInsert ) IF nPos <= 0 AAdd( ::aMenuItems, aItem ) nItemIndex := Len( ::aMenuItems ) - WVG_AppendMenu( ::hMenu, ; + Wvg_AppendMenu( ::hMenu, ; aItem[ 1 ], ; aItem[ 2 ], ; iif( HB_ISSTRING( aItem[ 3 ] ), StrTran( aItem[ 3 ], "~", "&" ), aItem[ 3 ] ) ) @@ -338,7 +338,7 @@ METHOD WvgMenuBar:putItem( aItem, nPos, lInsert ) nItemIndex := nPos IF lInsert ::aMenuItems := hb_AIns( ::aMenuItems, nPos, aItem, .T. ) - WVG_InsertMenu( ::hMenu, ; + Wvg_InsertMenu( ::hMenu, ; nItemIndex - 1, ; aItem[ 1 ] + MF_BYPOSITION, ; aItem[ 2 ], ; @@ -348,7 +348,7 @@ METHOD WvgMenuBar:putItem( aItem, nPos, lInsert ) aItem[ 2 ] := ::aMenuItems[ nItemIndex, 2 ] ENDIF ::aMenuItems[ nItemIndex ] := aItem - WVG_SetMenuItem( ::hMenu, ; + Wvg_SetMenuItem( ::hMenu, ; nItemIndex - 1, ; aItem[ 2 ], ; iif( HB_ISSTRING( aItem[ 3 ] ), StrTran( aItem[ 3 ], "~", "&" ), aItem[ 3 ] ), ; @@ -358,11 +358,11 @@ METHOD WvgMenuBar:putItem( aItem, nPos, lInsert ) IF ++::nPass == 1 IF ::oParent:className $ "WVGCRT,WVGDIALOG" - WVG_SetMenu( ::oParent:getHWND(), ::hMenu ) + Wvg_SetMenu( ::oParent:getHWND(), ::hMenu ) ENDIF ELSE IF ::oParent:className $ "WVGCRT,WVGDIALOG" - WVG_DrawMenuBar( ::oParent:getHWND() ) + Wvg_DrawMenuBar( ::oParent:getHWND() ) ENDIF ENDIF @@ -423,7 +423,7 @@ METHOD WvgMenuBar:checkItem( nItemNum, lCheck ) __defaultNIL( @lCheck, .T. ) IF ! Empty( ::hMenu ) .AND. HB_ISNUMERIC( nItemNum ) - nRet := WVG_CheckMenuItem( ::hMenu, nItemNum - 1, MF_BYPOSITION + iif( lCheck, MF_CHECKED, MF_UNCHECKED ) ) + nRet := Wvg_CheckMenuItem( ::hMenu, nItemNum - 1, MF_BYPOSITION + iif( lCheck, MF_CHECKED, MF_UNCHECKED ) ) ENDIF RETURN iif( nRet == -1, .F., .T. ) @@ -435,7 +435,7 @@ METHOD WvgMenuBar:enableItem( nItemNum ) LOCAL lSuccess := .F. IF ! Empty( ::hMenu ) .AND. HB_ISNUMERIC( nItemNum ) - lSuccess := WVG_EnableMenuItem( ::hMenu, nItemNum - 1, MF_BYPOSITION + MF_ENABLED ) + lSuccess := Wvg_EnableMenuItem( ::hMenu, nItemNum - 1, MF_BYPOSITION + MF_ENABLED ) ENDIF RETURN lSuccess @@ -447,7 +447,7 @@ METHOD WvgMenuBar:disableItem( nItemNum ) LOCAL lSuccess := .F. IF ! Empty( ::hMenu ) .AND. ! Empty( nItemNum ) - lSuccess := WVG_EnableMenuItem( ::hMenu, nItemNum - 1, MF_BYPOSITION + MF_GRAYED ) + lSuccess := Wvg_EnableMenuItem( ::hMenu, nItemNum - 1, MF_BYPOSITION + MF_GRAYED ) ENDIF RETURN lSuccess @@ -474,13 +474,13 @@ METHOD WvgMenuBar:insItem( nItemNum, aItem ) METHOD WvgMenuBar:isItemChecked( nItemNum ) - RETURN WVG_IsMenuItemChecked( ::hMenu, nItemNum - 1 ) + RETURN Wvg_IsMenuItemChecked( ::hMenu, nItemNum - 1 ) // METHOD WvgMenuBar:isItemEnabled( nItemNum ) - RETURN WVG_IsMenuItemEnabled( ::hMenu, nItemNum - 1 ) + RETURN Wvg_IsMenuItemEnabled( ::hMenu, nItemNum - 1 ) // @@ -499,7 +499,7 @@ METHOD WvgMenuBar:setItem( nItemNum, aItem ) RETURN ::putItem( aItem, nItemNum, .F. ) // - /* Callback Methods */ +/* Callback Methods */ // METHOD WvgMenuBar:beginMenu( xParam ) @@ -604,9 +604,9 @@ ENDCLASS METHOD WvgMenu:new( oParent, aPresParams, lVisible ) - __defaultNIL( @oParent , ::oParent ) + __defaultNIL( @oParent, ::oParent ) __defaultNIL( @aPresParams, ::aPresParams ) - __defaultNIL( @lVisible , ::visible ) + __defaultNIL( @lVisible, ::visible ) ::oParent := oParent ::aPresParams := aPresParams @@ -618,9 +618,9 @@ METHOD WvgMenu:new( oParent, aPresParams, lVisible ) METHOD WvgMenu:create( oParent, aPresParams, lVisible ) - __defaultNIL( @oParent , ::oParent ) + __defaultNIL( @oParent, ::oParent ) __defaultNIL( @aPresParams, ::aPresParams ) - __defaultNIL( @lVisible , ::visible ) + __defaultNIL( @lVisible, ::visible ) ::oParent := oParent ::aPresParams := aPresParams @@ -628,7 +628,7 @@ METHOD WvgMenu:create( oParent, aPresParams, lVisible ) ::className := "POPUPMENU" - ::hMenu := WVG_CreatePopupMenu() + ::hMenu := Wvg_CreatePOPUPMenu() RETURN Self @@ -653,7 +653,7 @@ METHOD WvgMenu:Popup( oXbp, aPos, nDefaultItem, nControl ) HB_SYMBOL_UNUSED( nDefaultItem ) HB_SYMBOL_UNUSED( nControl ) - nCmd := WVG_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 ] ) diff --git a/harbour/contrib/gtwvg/mle.prg b/harbour/contrib/gtwvg/mle.prg index 4b73c96613..7b5429c130 100644 --- a/harbour/contrib/gtwvg/mle.prg +++ b/harbour/contrib/gtwvg/mle.prg @@ -225,13 +225,13 @@ METHOD WvgMLE:handleEvent( nMessage, aNM ) CASE nMessage == HB_GTE_CTLCOLOR IF HB_ISNUMERIC( ::clr_FG ) - WVG_SetTextColor( aNM[ 1 ], ::clr_FG ) + Wvg_SetTextColor( aNM[ 1 ], ::clr_FG ) ENDIF IF HB_ISNUMERIC( ::hBrushBG ) - WVG_SetBkMode( aNM[ 1 ], 1 ) + Wvg_SetBkMode( aNM[ 1 ], 1 ) RETURN ::hBrushBG ELSE - RETURN WVG_GetCurrentBrush( aNM[ 1 ] ) + RETURN Wvg_GetCurrentBrush( aNM[ 1 ] ) ENDIF CASE nMessage == HB_GTE_ANY @@ -310,8 +310,8 @@ METHOD WvgMLE:copyMarked() LOCAL n, nB, nE n := ::sendMessage( EM_GETSEL ) - nB := WVG_LOWORD( n ) - nE := WVG_HIWORD( n ) + nB := Wvg_LOWORD( n ) + nE := Wvg_HIWORD( n ) IF ( n := nE - nB ) > 0 Wvt_SetClipboard( SubStr( ::getData(), nB, n ) ) @@ -326,8 +326,8 @@ METHOD WvgMLE:cutMarked() LOCAL n, nB, nE, cText n := ::sendMessage( EM_GETSEL ) - nB := WVG_LOWORD( n ) - nE := WVG_HIWORD( n ) + nB := Wvg_LOWORD( n ) + nE := Wvg_HIWORD( n ) IF ( n := nE - nB ) > 0 cText := ::getData() diff --git a/harbour/contrib/gtwvg/paint.prg b/harbour/contrib/gtwvg/paint.prg index 8dbb32d95d..5be147a5fd 100644 --- a/harbour/contrib/gtwvg/paint.prg +++ b/harbour/contrib/gtwvg/paint.prg @@ -164,7 +164,7 @@ FUNCTION WvtSetPaint( a_ ) // -FUNCTION wvg_SetPaint( cID, nAction, xData, aAttr ) +FUNCTION Wvg_SetPaint( cID, nAction, xData, aAttr ) LOCAL n, n1, oldData @@ -188,7 +188,7 @@ FUNCTION wvg_SetPaint( cID, nAction, xData, aAttr ) // -FUNCTION wvg_GetPaint( cID ) +FUNCTION Wvg_GetPaint( cID ) LOCAL n @@ -200,7 +200,7 @@ FUNCTION wvg_GetPaint( cID ) // -FUNCTION wvg_DelPaint( cID, nAction ) +FUNCTION Wvg_DelPaint( cID, nAction ) LOCAL xData, n1, n @@ -215,7 +215,7 @@ FUNCTION wvg_DelPaint( cID, nAction ) // -FUNCTION wvg_PurgePaint( cID, lDummy ) +FUNCTION Wvg_PurgePaint( cID, lDummy ) LOCAL n, aPaint @@ -234,7 +234,7 @@ FUNCTION wvg_PurgePaint( cID, lDummy ) // -FUNCTION wvg_InsertPaint( cID, aPaint, lSet ) +FUNCTION Wvg_InsertPaint( cID, aPaint, lSet ) LOCAL n @@ -263,7 +263,7 @@ FUNCTION wvg_InsertPaint( cID, aPaint, lSet ) // // // - /* nMode : 0 == Rows/cols - DEFAULT 1 == DlagUnits as from any standard dialog definition */ +/* nMode : 0 == Rows/cols - DEFAULT 1 == DlagUnits as from any standard dialog definition */ FUNCTION Wvt_SetDlgCoMode( nMode ) @@ -299,9 +299,9 @@ FUNCTION Wvt_MakeDlgTemplate( nTop, nLeft, nRows, nCols, aOffSet, cTitle, nStyle __defaultNIL( @aOffSet[ 3 ], 0 ) __defaultNIL( @aOffSet[ 4 ], 0 ) - nBaseUnits := WVG_GetDialogBaseUnits() - nBaseUnitsX := WVG_LOWORD( nBaseUnits ) - nBaseUnitsY := WVG_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 ] @@ -352,9 +352,9 @@ FUNCTION Wvt_MakeDlgTemplate( nTop, nLeft, nRows, nCols, aOffSet, cTitle, nStyle IF hb_bitAnd( nStyle, DS_SETFONT ) == DS_SETFONT AAdd( aDlg[ 1 ], iif( HB_ISNUMERIC( nPointSize ), nPointSize, 8 ) ) - AAdd( aDlg[ 1 ], iif( HB_ISNUMERIC( nWeight ), nWeight , 400 ) ) - AAdd( aDlg[ 1 ], iif( HB_ISLOGICAL( lItalic ), lItalic , .F. ) ) - AAdd( aDlg[ 1 ], iif( HB_ISSTRING( cFaceName ), cFaceName , "MS Sans Serif" ) ) + AAdd( aDlg[ 1 ], iif( HB_ISNUMERIC( nWeight ), nWeight, 400 ) ) + AAdd( aDlg[ 1 ], iif( HB_ISLOGICAL( lItalic ), lItalic, .F. ) ) + AAdd( aDlg[ 1 ], iif( HB_ISSTRING( cFaceName ), cFaceName, "MS Sans Serif" ) ) ENDIF RETURN aDlg @@ -382,9 +382,9 @@ FUNCTION Wvt_AddDlgItem( aDlg, nTop, nLeft, nRows, nCols, aOffSet, ; __defaultNIL( @aOffSet[ 3 ], 0 ) __defaultNIL( @aOffSet[ 4 ], 0 ) - nBaseUnits := WVG_GetDialogBaseUnits() - nBaseUnitsX := WVG_LOWORD( nBaseUnits ) - nBaseUnitsY := WVG_HIWORD( nBaseUnits ) + nBaseUnits := Wvg_GetDialogBaseUnits() + nBaseUnitsX := Wvg_LOWORD( nBaseUnits ) + nBaseUnitsY := Wvg_HIWORD( nBaseUnits ) aXY := Wvt_GetXYFromRowCol( nTop, nLeft ) nX := aXY[ 1 ] + aOffSet[ 2 ] @@ -454,12 +454,12 @@ FUNCTION Wvt_CreateDialog( acnDlg, lOnTop, cbDlgProc, ncIcon, nTimerTicks, hMenu ENDIF IF HB_ISNUMERIC( nTimerTicks ) - WVG_SetTimer( hDlg, 1001, nTimerTicks ) + Wvg_SetTimer( hDlg, 1001, nTimerTicks ) ENDIF IF hMenu != nil - WVG_SetMenu( hDlg, hMenu ) + Wvg_SetMenu( hDlg, hMenu ) ENDIF @@ -511,7 +511,7 @@ cDefName: DEFAULT file name Returns: If OFN_ALLOWMULTISELECT ? Array of files selected : FileName. */ -FUNCTION WVT_GetOpenFileName( hWnd, cPath, cTitle, acFilter, nFlags, cInitDir, cDefExt, nFilterIndex, cDefName ) +FUNCTION Wvt_GetOpenFilename( hWnd, cPath, cTitle, acFilter, nFlags, cInitDir, cDefExt, nFilterIndex, cDefName ) LOCAL cRet, aTmp, xRet, i @@ -524,9 +524,9 @@ FUNCTION WVT_GetOpenFileName( hWnd, cPath, cTitle, acFilter, nFlags, cInitDir, c * [], [[@]], [], [] ) * -> | + e"\0" + [ + e"\0" + ] | "" */ - cRet := WIN_GetOpenFileName( @nFlags, cTitle, cInitDir, cDefExt, acFilter, @nFilterIndex, /*nBufferSize*/, cDefName ) + cRet := win_GetOpenFileName( @nFlags, cTitle, cInitDir, cDefExt, acFilter, @nFilterIndex, /*nBufferSize*/, cDefName ) - IF WVG_And( nFlags, OFN_ALLOWMULTISELECT ) > 0 + IF Wvg_And( nFlags, OFN_ALLOWMULTISELECT ) > 0 xRet := {} IF ! Empty( aTmp := hb_ATokens( cRet, Chr( 0 ) ) ) cPath := aTmp[ 1 ] @@ -556,7 +556,7 @@ nIndex: Index position of types Returns: FileName. */ -FUNCTION WVT_GetSaveFileName( hWnd, cDefName, cTitle, acFilter, nFlags, cInitDir, cDefExt, nFilterIndex ) +FUNCTION Wvt_GetSaveFilename( hWnd, cDefName, cTitle, acFilter, nFlags, cInitDir, cDefExt, nFilterIndex ) LOCAL cRet, aTmp, xRet, i, cPath @@ -568,9 +568,9 @@ FUNCTION WVT_GetSaveFileName( hWnd, cDefName, cTitle, acFilter, nFlags, cInitDir * [], [[@]], [], [] ) * -> | + e"\0" + [ + e"\0" + ] | "" */ - cRet := WIN_GetSaveFileName( @nFlags, cTitle, cInitDir, cDefExt, acFilter, @nFilterIndex, /*nBufferSize*/, cDefName ) + cRet := win_GetSaveFileName( @nFlags, cTitle, cInitDir, cDefExt, acFilter, @nFilterIndex, /*nBufferSize*/, cDefName ) - IF WVG_And( nFlags, OFN_ALLOWMULTISELECT ) > 0 + IF Wvg_And( nFlags, OFN_ALLOWMULTISELECT ) > 0 xRet := {} IF ! Empty( aTmp := hb_ATokens( cRet, Chr( 0 ) ) ) cPath := aTmp[ 1 ] @@ -631,16 +631,16 @@ FUNCTION Wvt_SetIcon( ncIconRes, cIconName ) FUNCTION Wvt_SetFont( cFontName, nSize, nWidth, nWeight, nQuality ) __defaultNIL( @cFontName, hb_gtInfo( HB_GTI_FONTNAME ) ) - __defaultNIL( @nWidth , hb_gtInfo( HB_GTI_FONTWIDTH ) ) - __defaultNIL( @nWeight , hb_gtInfo( HB_GTI_FONTWEIGHT ) ) - __defaultNIL( @nQuality , hb_gtInfo( HB_GTI_FONTQUALITY ) ) - __defaultNIL( @nSize , hb_gtInfo( HB_GTI_FONTSIZE ) ) + __defaultNIL( @nWidth, hb_gtInfo( HB_GTI_FONTWIDTH ) ) + __defaultNIL( @nWeight, hb_gtInfo( HB_GTI_FONTWEIGHT ) ) + __defaultNIL( @nQuality, hb_gtInfo( HB_GTI_FONTQUALITY ) ) + __defaultNIL( @nSize, hb_gtInfo( HB_GTI_FONTSIZE ) ) RETURN hb_gtInfo( HB_GTI_SETFONT, { cFontName, nSize, nWidth, nWeight, nQuality } ) // -FUNCTION Wvt_SetCodePage( nCodePage ) +FUNCTION Wvt_SetCodepage( nCodePage ) RETURN hb_gtInfo( HB_GTI_CODEPAGE, nCodePage ) @@ -680,7 +680,7 @@ FUNCTION Wvt_GetRGBColor( nIndex ) #define YELLOW RGB( 0xFF,0xFF,0x00 ) #define WHITE RGB( 0xFF,0xFF,0xFF ) -FUNCTION Wvt_GetRGBColorByString( cColor, nForeBack ) +FUNCTION Wvt_GetRGBColorBYString( cColor, nForeBack ) LOCAL s, n, lEnh LOCAL nIndex := 0 @@ -743,7 +743,7 @@ FUNCTION Wvt_GetWindowHandle() FUNCTION Wvt_CenterWindow( lCenter, lRePaint ) - __defaultNIL( @lCenter , .T. ) + __defaultNIL( @lCenter, .T. ) __defaultNIL( @lRePaint, .F. ) RETURN hb_gtInfo( HB_GTI_SPEC, HB_GTS_CENTERWINDOW, { lCenter, lRePaint } ) @@ -752,7 +752,7 @@ FUNCTION Wvt_CenterWindow( lCenter, lRePaint ) FUNCTION Wvt_WindowCentre( lCenter, lRePaint ) - __defaultNIL( @lCenter , .T. ) + __defaultNIL( @lCenter, .T. ) __defaultNIL( @lRePaint, .F. ) RETURN hb_gtInfo( HB_GTI_SPEC, HB_GTS_CENTERWINDOW, { lCenter, lRePaint } ) @@ -767,7 +767,7 @@ FUNCTION Wvt_ProcessMessages() // -FUNCTION Wvt_KeyBoard( nKey ) +FUNCTION Wvt_Keyboard( nKey ) hb_gtInfo( HB_GTI_SPEC, HB_GTS_KEYBOARD, nKey ) @@ -794,7 +794,7 @@ FUNCTION Wvt_PasteFromClipboard() cText := hb_gtInfo( HB_GTI_CLIPBOARDDATA ) IF ( nLen := Len( cText ) ) > 0 FOR i := 1 TO nLen - Wvt_KeyBoard( Asc( SubStr( cText, i, 1 ) ) ) + Wvt_Keyboard( Asc( SubStr( cText, i, 1 ) ) ) NEXT ENDIF diff --git a/harbour/contrib/gtwvg/parthdlr.prg b/harbour/contrib/gtwvg/parthdlr.prg index 11a48b67b4..3650bc3062 100644 --- a/harbour/contrib/gtwvg/parthdlr.prg +++ b/harbour/contrib/gtwvg/parthdlr.prg @@ -125,7 +125,7 @@ METHOD WvgPartHandler:new( oParent, oOwner ) METHOD WvgPartHandler:create( oParent, oOwner ) __defaultNIL( @oParent, ::oParent ) - __defaultNIL( @oOwner , ::oOwner ) + __defaultNIL( @oOwner, ::oOwner ) ::oParent := oParent ::oOwner := oOwner @@ -137,7 +137,7 @@ METHOD WvgPartHandler:create( oParent, oOwner ) METHOD WvgPartHandler:configure( oParent, oOwner ) __defaultNIL( @oParent, ::oParent ) - __defaultNIL( @oOwner , ::oOwner ) + __defaultNIL( @oOwner, ::oOwner ) ::oParent := oParent ::oOwner := oOwner @@ -397,7 +397,7 @@ METHOD WvgPartHandler:notifier( nEvent, xParams ) /* Eventally every window be checked if it falls within returned rectangle or not * then it will avoid a lot of flickering */ - AEval( ::aChildren, {| o | WVG_InvalidateRect( o:hWnd ) } ) + AEval( ::aChildren, {| o | Wvg_InvalidateRect( o:hWnd ) } ) CASE nEvent == HB_GTE_CLOSE IF HB_ISBLOCK( ::close ) @@ -512,8 +512,8 @@ METHOD WvgPartHandler:controlWndProc( hWnd, nMessage, nwParam, nlParam ) EXIT CASE WM_COMMAND - nCtrlID := WVG_LOWORD( nwParam ) - nNotifctn := WVG_HIWORD( nwParam ) + nCtrlID := Wvg_LOWORD( nwParam ) + nNotifctn := Wvg_HIWORD( nwParam ) hWndCtrl := nlParam IF hWndCtrl == 0 /* It is menu */ @@ -561,7 +561,7 @@ METHOD WvgPartHandler:controlWndProc( hWnd, nMessage, nwParam, nlParam ) IF HB_ISOBJECT( oObj ) nReturn := oObj:handleEvent( HB_GTE_CTLCOLOR, { nwParam, nlParam } ) IF nReturn == EVENT_UNHANDELLED - RETURN WVG_CallWindowProc( ::nOldProc, hWnd, nMessage, nwParam, nlParam ) + RETURN Wvg_CallWindowProc( ::nOldProc, hWnd, nMessage, nwParam, nlParam ) ELSE RETURN nReturn ENDIF @@ -569,11 +569,11 @@ METHOD WvgPartHandler:controlWndProc( hWnd, nMessage, nwParam, nlParam ) EXIT CASE WM_HSCROLL - ::handleEvent( HB_GTE_HSCROLL, { WVG_LOWORD( nwParam ), WVG_HIWORD( nwParam ), nlParam } ) + ::handleEvent( HB_GTE_HSCROLL, { Wvg_LOWORD( nwParam ), Wvg_HIWORD( nwParam ), nlParam } ) RETURN 0 CASE WM_VSCROLL - IF ::handleEvent( HB_GTE_VSCROLL, { WVG_LOWORD( nwParam ), WVG_HIWORD( nwParam ), nlParam } ) == EVENT_HANDELLED + IF ::handleEvent( HB_GTE_VSCROLL, { Wvg_LOWORD( nwParam ), Wvg_HIWORD( nwParam ), nlParam } ) == EVENT_HANDELLED RETURN 0 ENDIF EXIT @@ -592,7 +592,7 @@ METHOD WvgPartHandler:controlWndProc( hWnd, nMessage, nwParam, nlParam ) CASE WM_MOUSEHOVER IF ::objType == objTypeScrollBar IF ::oParent:objType == objTypeCrt - WAPI_SetFocus( ::oParent:pWnd ) + wapi_SetFocus( ::oParent:pWnd ) ENDIF RETURN 0 ENDIF @@ -602,7 +602,7 @@ METHOD WvgPartHandler:controlWndProc( hWnd, nMessage, nwParam, nlParam ) IF ::objType == objTypeScrollBar ::lTracking := .F. IF ::oParent:objType == objTypeCrt - WAPI_SetFocus( ::oParent:pWnd ) + wapi_SetFocus( ::oParent:pWnd ) ENDIF ENDIF EXIT @@ -621,6 +621,6 @@ METHOD WvgPartHandler:controlWndProc( hWnd, nMessage, nwParam, nlParam ) ENDSWITCH - RETURN WVG_CallWindowProc( ::nOldProc, hWnd, nMessage, nwParam, nlParam ) + RETURN Wvg_CallWindowProc( ::nOldProc, hWnd, nMessage, nwParam, nlParam ) // diff --git a/harbour/contrib/gtwvg/pushbut.prg b/harbour/contrib/gtwvg/pushbut.prg index 9ef0424d88..e92b20a2cf 100644 --- a/harbour/contrib/gtwvg/pushbut.prg +++ b/harbour/contrib/gtwvg/pushbut.prg @@ -182,10 +182,10 @@ METHOD WvgPushButton:handleEvent( nMessage, aNM ) CASE nMessage == HB_GTE_CTLCOLOR IF HB_ISNUMERIC( ::clr_FG ) - WVG_SetTextColor( aNM[ 1 ], ::clr_FG ) + Wvg_SetTextColor( aNM[ 1 ], ::clr_FG ) ENDIF IF HB_ISNUMERIC( ::hBrushBG ) - WVG_SetBkMode( aNM[ 1 ], 1 ) + Wvg_SetBkMode( aNM[ 1 ], 1 ) RETURN ::hBrushBG ENDIF @@ -230,16 +230,16 @@ METHOD WvgPushButton:setCaption( xCaption, cDll ) IF HB_ISSTRING( xCaption ) ::caption := xCaption IF ".ico" == Lower( Right( ::caption, 4 ) ) - WVG_SendMessage( ::hWnd, BM_SETIMAGE, IMAGE_ICON, WVG_LoadImage( ::caption, 2, IMAGE_ICON ) ) + Wvg_SendMessage( ::hWnd, BM_SETIMAGE, IMAGE_ICON, Wvg_LoadImage( ::caption, 2, IMAGE_ICON ) ) ELSEIF ".BMP" == Upper( Right( ::caption, 4 ) ) - WVG_SendMessage( ::hWnd, BM_SETIMAGE, IMAGE_BITMAP, WVG_LoadImage( ::caption, 2, IMAGE_BITMAP ) ) + Wvg_SendMessage( ::hWnd, BM_SETIMAGE, IMAGE_BITMAP, Wvg_LoadImage( ::caption, 2, IMAGE_BITMAP ) ) ELSE - WVG_SendMessageText( ::hWnd, WM_SETTEXT, 0, ::caption ) + Wvg_SendMessageText( ::hWnd, WM_SETTEXT, 0, ::caption ) ENDIF ELSEIF HB_ISNUMERIC( xCaption ) /* Handle to the bitmap */ ::caption := xCaption - WVG_SendMessage( ::hWnd, BM_SETIMAGE, IMAGE_BITMAP, ::caption ) + Wvg_SendMessage( ::hWnd, BM_SETIMAGE, IMAGE_BITMAP, ::caption ) ENDIF diff --git a/harbour/contrib/gtwvg/radiobut.prg b/harbour/contrib/gtwvg/radiobut.prg index 3e0ba6f1f5..170a7efd08 100644 --- a/harbour/contrib/gtwvg/radiobut.prg +++ b/harbour/contrib/gtwvg/radiobut.prg @@ -148,7 +148,7 @@ METHOD handleEvent( nMessage, aNM ) CLASS WvgRadioButton CASE HB_GTE_COMMAND IF aNM[ NMH_code ] == BN_CLICKED - ::editBuffer := ( WVG_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_ISSTRING( xCaption ) ::caption := xCaption - WVG_SendMessageText( ::hWnd, WM_SETTEXT, 0, ::caption ) + Wvg_SendMessageText( ::hWnd, WM_SETTEXT, 0, ::caption ) ENDIF RETURN Self diff --git a/harbour/contrib/gtwvg/scrollbr.prg b/harbour/contrib/gtwvg/scrollbr.prg index 80b76f9fb2..d98599084e 100644 --- a/harbour/contrib/gtwvg/scrollbr.prg +++ b/harbour/contrib/gtwvg/scrollbr.prg @@ -144,7 +144,7 @@ METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) CLASS WvgSc si IS SCROLLINFO si:cbSize := si:sizeof cSI := si:value - IF WAPI_GetScrollInfo( ::pWnd, SB_CTL, @cSI ) + IF wapi_GetScrollInfo( ::pWnd, SB_CTL, @cSI ) si:buffer( cSI ) ENDIF #endif @@ -166,7 +166,7 @@ METHOD handleEvent( nMessage, aNM ) CLASS WvgScrollBar CASE nMessage == HB_GTE_CTLCOLOR IF HB_ISNUMERIC( ::hBrushBG ) - WVG_SetBkMode( aNM[ 1 ], 1 ) + Wvg_SetBkMode( aNM[ 1 ], 1 ) RETURN ::hBrushBG ENDIF @@ -183,57 +183,57 @@ METHOD handleEvent( nMessage, aNM ) CLASS WvgScrollBar IF nScrMsg == SB_THUMBPOSITION .OR. nScrMsg == SB_THUMBTRACK nScrPos := aNM[ 2 ] ELSE - nScrPos := WAPI_GetScrollPos( ::pWnd, SB_CTL ) + nScrPos := wapi_GetScrollPos( ::pWnd, SB_CTL ) ENDIF DO CASE CASE nScrMsg == SB_LEFT nCommand := WVGSB_PREVPOS IF nScrPos > ::range[ 1 ] - WAPI_SetScrollPos( ::pWnd, SB_CTL, --nScrPos, .T. ) + wapi_SetScrollPos( ::pWnd, SB_CTL, --nScrPos, .T. ) ENDIF CASE nScrMsg == SB_RIGHT nCommand := WVGSB_NEXTPOS IF nScrPos < ::range[ 2 ] - WAPI_SetScrollPos( ::pWnd, SB_CTL, ++nScrPos, .T. ) + wapi_SetScrollPos( ::pWnd, SB_CTL, ++nScrPos, .T. ) ENDIF CASE nScrMsg == SB_LINELEFT nCommand := WVGSB_PREVPAGE IF nScrPos > ::range[ 1 ] - WAPI_SetScrollPos( ::pWnd, SB_CTL, --nScrPos, .T. ) + wapi_SetScrollPos( ::pWnd, SB_CTL, --nScrPos, .T. ) ENDIF CASE nScrMsg == SB_LINERIGHT nCommand := WVGSB_NEXTPAGE IF nScrPos < ::range[ 2 ] - WAPI_SetScrollPos( ::pWnd, SB_CTL, ++nScrPos, .T. ) + wapi_SetScrollPos( ::pWnd, SB_CTL, ++nScrPos, .T. ) ENDIF CASE nScrMsg == SB_PAGELEFT nCommand := WVGSB_PREVPAGE IF nScrPos > ::range[ 1 ] - WAPI_SetScrollPos( ::pWnd, SB_CTL, --nScrPos, .T. ) + wapi_SetScrollPos( ::pWnd, SB_CTL, --nScrPos, .T. ) ENDIF CASE nScrMsg == SB_PAGERIGHT nCommand := WVGSB_NEXTPAGE IF nScrPos < ::range[ 2 ] - WAPI_SetScrollPos( ::pWnd, SB_CTL, ++nScrPos, .T. ) + wapi_SetScrollPos( ::pWnd, SB_CTL, ++nScrPos, .T. ) ENDIF CASE nScrMsg == SB_THUMBPOSITION nCommand := WVGSB_SLIDERTRACK - WAPI_SetScrollPos( ::pWnd, SB_CTL, nScrPos, .T. ) + wapi_SetScrollPos( ::pWnd, SB_CTL, nScrPos, .T. ) CASE nScrMsg == SB_THUMBTRACK nCommand := WVGSB_ENDTRACK - WAPI_SetScrollPos( ::pWnd, SB_CTL, nScrPos, .T. ) + wapi_SetScrollPos( ::pWnd, SB_CTL, nScrPos, .T. ) CASE nScrMsg == SB_ENDSCROLL nCommand := WVGSB_ENDSCROLL - WAPI_SetScrollPos( ::pWnd, SB_CTL, nScrPos, .T. ) + wapi_SetScrollPos( ::pWnd, SB_CTL, nScrPos, .T. ) ENDCASE @@ -251,7 +251,7 @@ METHOD handleEvent( nMessage, aNM ) CLASS WvgScrollBar IF nScrMsg == SB_THUMBPOSITION .OR. nScrMsg == SB_THUMBTRACK nScrPos := aNM[ 2 ] ELSE - nScrPos := WAPI_GetScrollPos( ::pWnd, SB_CTL ) + nScrPos := wapi_GetScrollPos( ::pWnd, SB_CTL ) ENDIF IF ! HB_ISBLOCK( ::sl_xbeSB_Scroll ) @@ -262,50 +262,50 @@ METHOD handleEvent( nMessage, aNM ) CLASS WvgScrollBar CASE nScrMsg == SB_TOP nCommand := WVGSB_TOP IF nScrPos > ::range[ 1 ] - WAPI_SetScrollPos( ::pWnd, SB_CTL, --nScrPos, .T. ) + wapi_SetScrollPos( ::pWnd, SB_CTL, --nScrPos, .T. ) ENDIF CASE nScrMsg == SB_BOTTOM nCommand := WVGSB_BOTTOM IF nScrPos < ::range[ 2 ] - WAPI_SetScrollPos( ::pWnd, SB_CTL, ++nScrPos, .T. ) + wapi_SetScrollPos( ::pWnd, SB_CTL, ++nScrPos, .T. ) ENDIF CASE nScrMsg == SB_LINEUP nCommand := WVGSB_PREVPOS IF nScrPos > ::range[ 1 ] - WAPI_SetScrollPos( ::pWnd, SB_CTL, --nScrPos, .T. ) + wapi_SetScrollPos( ::pWnd, SB_CTL, --nScrPos, .T. ) ENDIF CASE nScrMsg == SB_LINEDOWN nCommand := WVGSB_NEXTPOS IF nScrPos < ::range[ 2 ] - WAPI_SetScrollPos( ::pWnd, SB_CTL, ++nScrPos, .T. ) + wapi_SetScrollPos( ::pWnd, SB_CTL, ++nScrPos, .T. ) ENDIF CASE nScrMsg == SB_PAGEUP nCommand := WVGSB_PREVPAGE IF nScrPos > ::range[ 1 ] - WAPI_SetScrollPos( ::pWnd, SB_CTL, --nScrPos, .T. ) + wapi_SetScrollPos( ::pWnd, SB_CTL, --nScrPos, .T. ) ENDIF CASE nScrMsg == SB_PAGEDOWN nCommand := WVGSB_NEXTPAGE IF nScrPos < ::range[ 2 ] - WAPI_SetScrollPos( ::pWnd, SB_CTL, ++nScrPos, .T. ) + wapi_SetScrollPos( ::pWnd, SB_CTL, ++nScrPos, .T. ) ENDIF CASE nScrMsg == SB_THUMBPOSITION nCommand := WVGSB_SLIDERTRACK - WAPI_SetScrollPos( ::pWnd, SB_CTL, nScrPos, .T. ) + wapi_SetScrollPos( ::pWnd, SB_CTL, nScrPos, .T. ) CASE nScrMsg == SB_THUMBTRACK nCommand := WVGSB_ENDTRACK - WAPI_SetScrollPos( ::pWnd, SB_CTL, nScrPos, .T. ) + wapi_SetScrollPos( ::pWnd, SB_CTL, nScrPos, .T. ) CASE nScrMsg == SB_ENDSCROLL nCommand := WVGSB_ENDSCROLL - WAPI_SetScrollPos( ::pWnd, SB_CTL, nScrPos, .T. ) + wapi_SetScrollPos( ::pWnd, SB_CTL, nScrPos, .T. ) ENDCASE @@ -343,13 +343,13 @@ METHOD setRange( aRange ) CLASS WvgScrollBar LOCAL aOldRange, nMin, nMax - IF WAPI_GetScrollRange( ::pWnd, SB_CTL, @nMin, @nMax ) + IF wapi_GetScrollRange( ::pWnd, SB_CTL, @nMin, @nMax ) aOldRange := { nMin, nMax } ELSE aOldRange := ::range ENDIF - IF WAPI_SetScrollRange( ::pWnd, SB_CTL, aRange[ 1 ], aRange[ 2 ], .T. ) + IF wapi_SetScrollRange( ::pWnd, SB_CTL, aRange[ 1 ], aRange[ 2 ], .T. ) ::range := aRange ENDIF diff --git a/harbour/contrib/gtwvg/sle.prg b/harbour/contrib/gtwvg/sle.prg index 16fc884484..c8ba9a09fd 100644 --- a/harbour/contrib/gtwvg/sle.prg +++ b/harbour/contrib/gtwvg/sle.prg @@ -213,13 +213,13 @@ METHOD handleEvent( nMessage, aNM ) CLASS WvgSLE CASE nMessage == HB_GTE_CTLCOLOR IF HB_ISNUMERIC( ::clr_FG ) - WVG_SetTextColor( aNM[ 1 ], ::clr_FG ) + Wvg_SetTextColor( aNM[ 1 ], ::clr_FG ) ENDIF IF HB_ISNUMERIC( ::hBrushBG ) - WVG_SetBkMode( aNM[ 1 ], 1 ) + Wvg_SetBkMode( aNM[ 1 ], 1 ) RETURN ::hBrushBG ELSE - RETURN WVG_GetCurrentBrush( aNM[ 1 ] ) + RETURN Wvg_GetCurrentBrush( aNM[ 1 ] ) ENDIF CASE nMessage == HB_GTE_ANY @@ -296,8 +296,8 @@ METHOD WvgSLE:copyMarked() LOCAL n, nB, nE n := ::sendMessage( EM_GETSEL ) - nB := WVG_LOWORD( n ) - nE := WVG_HIWORD( n ) + nB := Wvg_LOWORD( n ) + nE := Wvg_HIWORD( n ) IF ( n := nE - nB ) > 0 Wvt_SetClipboard( SubStr( ::getData(), nB, n ) ) @@ -312,8 +312,8 @@ METHOD WvgSLE:cutMarked() LOCAL n, nB, nE, cText n := ::sendMessage( EM_GETSEL ) - nB := WVG_LOWORD( n ) - nE := WVG_HIWORD( n ) + nB := Wvg_LOWORD( n ) + nE := Wvg_HIWORD( n ) IF ( n := nE - nB ) > 0 cText := ::getData() diff --git a/harbour/contrib/gtwvg/statbar.prg b/harbour/contrib/gtwvg/statbar.prg index d104a8ae46..e623fdb0f4 100644 --- a/harbour/contrib/gtwvg/statbar.prg +++ b/harbour/contrib/gtwvg/statbar.prg @@ -185,13 +185,13 @@ METHOD WvgStatusBar:handleEvent( nMessage, aNM ) CASE nMessage == HB_GTE_CTLCOLOR IF HB_ISNUMERIC( ::clr_FG ) - WVG_SetTextColor( aNM[ 1 ], ::clr_FG ) + Wvg_SetTextColor( aNM[ 1 ], ::clr_FG ) ENDIF IF HB_ISNUMERIC( ::hBrushBG ) - WVG_SetBkMode( aNM[ 1 ], 1 ) + Wvg_SetBkMode( aNM[ 1 ], 1 ) RETURN ::hBrushBG ELSE - RETURN WVG_GetCurrentBrush( aNM[ 1 ] ) + RETURN Wvg_GetCurrentBrush( aNM[ 1 ] ) ENDIF ENDCASE @@ -362,9 +362,9 @@ ENDCLASS METHOD WvgStatusBarPanel:new( cCaption, nStyle, cKey ) - __defaultNIL( @cCaption , ::sl_caption ) - __defaultNIL( @nStyle , ::style ) - __defaultNIL( @cKey , ::key ) + __defaultNIL( @cCaption, ::sl_caption ) + __defaultNIL( @nStyle, ::style ) + __defaultNIL( @cKey, ::key ) ::sl_caption := cCaption ::style := nStyle diff --git a/harbour/contrib/gtwvg/static.prg b/harbour/contrib/gtwvg/static.prg index fc4fd4d8a9..a4175fb35d 100644 --- a/harbour/contrib/gtwvg/static.prg +++ b/harbour/contrib/gtwvg/static.prg @@ -255,13 +255,13 @@ METHOD WvgStatic:handleEvent( nMessage, aNM ) CASE nMessage == HB_GTE_CTLCOLOR IF HB_ISNUMERIC( ::clr_FG ) - WVG_SetTextColor( aNM[ 1 ], ::clr_FG ) + Wvg_SetTextColor( aNM[ 1 ], ::clr_FG ) ENDIF IF HB_ISNUMERIC( ::hBrushBG ) - WVG_SetBkMode( aNM[ 1 ], 1 ) + Wvg_SetBkMode( aNM[ 1 ], 1 ) RETURN ::hBrushBG ELSE - RETURN WVG_GetCurrentBrush( aNM[ 1 ] ) + RETURN Wvg_GetCurrentBrush( aNM[ 1 ] ) ENDIF CASE nMessage == HB_GTE_ANY @@ -279,7 +279,7 @@ METHOD WvgStatic:handleEvent( nMessage, aNM ) METHOD WvgStatic:destroy() IF ::hBitmap != nil - WVG_DeleteObject( ::hBitmap ) + Wvg_DeleteObject( ::hBitmap ) ENDIF ::wvgWindow:destroy() @@ -304,16 +304,16 @@ METHOD WvgStatic:setCaption( xCaption, cDll ) DO CASE CASE ::type == WVGSTATIC_TYPE_TEXT - WVG_SendMessageText( ::hWnd, WM_SETTEXT, 0, ::caption ) + Wvg_SendMessageText( ::hWnd, WM_SETTEXT, 0, ::caption ) CASE ::type == WVGSTATIC_TYPE_BITMAP IF ::hBitmap != nil - WVG_DeleteObject( ::hBitmap ) + Wvg_DeleteObject( ::hBitmap ) ENDIF - ::hBitmap := WVG_LoadImage( ::caption, iif( HB_ISNUMERIC( ::caption ), 1, 2 ) ) + ::hBitmap := Wvg_LoadImage( ::caption, iif( HB_ISNUMERIC( ::caption ), 1, 2 ) ) - WVG_SendMessage( ::hWnd, STM_SETIMAGE, IMAGE_BITMAP, ::hBitmap ) + Wvg_SendMessage( ::hWnd, STM_SETIMAGE, IMAGE_BITMAP, ::hBitmap ) ENDCASE diff --git a/harbour/contrib/gtwvg/syswnd.prg b/harbour/contrib/gtwvg/syswnd.prg index 10396292fa..f29e0779af 100644 --- a/harbour/contrib/gtwvg/syswnd.prg +++ b/harbour/contrib/gtwvg/syswnd.prg @@ -87,7 +87,7 @@ CREATE CLASS WvgSysWindow INHERIT WvgPartHandler METHOD enable() METHOD hide() METHOD show() - METHOD setPos( aPos ) + METHOD SetPos( aPos ) METHOD currentPos() METHOD currentSize() @@ -118,8 +118,8 @@ ENDCLASS METHOD WvgSysWindow:new( oParent, oOwner, aPos ) __defaultNIL( @oParent, ::oParent ) - __defaultNIL( @oOwner , ::oOwner ) - __defaultNIL( @aPos , ::aPos ) + __defaultNIL( @oOwner, ::oOwner ) + __defaultNIL( @aPos, ::aPos ) ::oParent := oParent ::oOwner := oOwner @@ -134,8 +134,8 @@ METHOD WvgSysWindow:new( oParent, oOwner, aPos ) METHOD WvgSysWindow:create( oParent, oOwner, aPos ) __defaultNIL( @oParent, ::oParent ) - __defaultNIL( @oOwner , ::oOwner ) - __defaultNIL( @aPos , ::aPos ) + __defaultNIL( @oOwner, ::oOwner ) + __defaultNIL( @aPos, ::aPos ) ::oParent := oParent ::oOwner := oOwner @@ -183,9 +183,9 @@ METHOD WvgSysWindow:show() // -METHOD WvgSysWindow:setPos( aPos ) +METHOD WvgSysWindow:SetPos( aPos ) - WVG_SetWindowPosition( ::hWnd, aPos[ 1 ], aPos[ 2 ], .F. ) + Wvg_SetWindowPosition( ::hWnd, aPos[ 1 ], aPos[ 2 ], .F. ) RETURN Self @@ -195,7 +195,7 @@ METHOD WvgSysWindow:currentPos() LOCAL aRect - aRect := WVG_GetWindowRect( ::hWnd ) + aRect := Wvg_GetWindowRect( ::hWnd ) RETURN { aRect[ 1 ], aRect[ 2 ] } @@ -205,7 +205,7 @@ METHOD WvgSysWindow:currentSize() LOCAL aRect - aRect := WVG_GetClientRect( ::hWnd ) + aRect := Wvg_GetClientRect( ::hWnd ) RETURN { aRect[ 3 ] - aRect[ 1 ], aRect[ 4 ] - aRect[ 2 ] } @@ -296,11 +296,11 @@ ENDCLASS METHOD new( oParent, oOwner, oScreenPS, oPrinterPS, aPos ) CLASS WvgFontDialog - __defaultNIL( @oParent , ::oParent ) - __defaultNIL( @oOwner , ::oOwner ) - __defaultNIL( @oScreenPS , ::oScreenPS ) + __defaultNIL( @oParent, ::oParent ) + __defaultNIL( @oOwner, ::oOwner ) + __defaultNIL( @oScreenPS, ::oScreenPS ) __defaultNIL( @oPrinterPS, ::oPrinterPS ) - __defaultNIL( @aPos , ::aPos ) + __defaultNIL( @aPos, ::aPos ) ::oParent := oParent ::oOwner := oOwner @@ -316,11 +316,11 @@ METHOD new( oParent, oOwner, oScreenPS, oPrinterPS, aPos ) CLASS WvgFontDialog METHOD create( oParent, oOwner, oScreenPS, oPrinterPS, aPos ) CLASS WvgFontDialog - __defaultNIL( @oParent , ::oParent ) - __defaultNIL( @oOwner , ::oOwner ) - __defaultNIL( @oScreenPS , ::oScreenPS ) + __defaultNIL( @oParent, ::oParent ) + __defaultNIL( @oOwner, ::oOwner ) + __defaultNIL( @oScreenPS, ::oScreenPS ) __defaultNIL( @oPrinterPS, ::oPrinterPS ) - __defaultNIL( @aPos , ::aPos ) + __defaultNIL( @aPos, ::aPos ) ::oParent := oParent ::oOwner := oOwner @@ -355,43 +355,43 @@ METHOD wndProc( hWnd, nMessage, nwParam, nlParam ) CLASS WvgFontDialog ::hWnd := hWnd IF ! Empty( ::title ) - WVG_SetWindowText( ::hWnd, ::title ) + Wvg_SetWindowText( ::hWnd, ::title ) ENDIF IF ! ::buttonCancel - WVG_EnableWindow( WVG_GetDlgItem( ::hWnd, IDCANCEL ), .F. ) + Wvg_EnableWindow( Wvg_GetDlgItem( ::hWnd, IDCANCEL ), .F. ) ENDIF IF ! ::buttonApply - WVG_EnableWindow( WVG_GetDlgItem( ::hWnd, 1026 ), .F. ) + Wvg_EnableWindow( Wvg_GetDlgItem( ::hWnd, 1026 ), .F. ) ENDIF IF ! ::buttonHelp - WVG_EnableWindow( WVG_GetDlgItem( ::hWnd, 1038 ), .F. ) + Wvg_EnableWindow( Wvg_GetDlgItem( ::hWnd, 1038 ), .F. ) ENDIF IF ! ::strikeOut - WVG_EnableWindow( WVG_GetDlgItem( ::hWnd, 1040 ), .F. ) + Wvg_EnableWindow( Wvg_GetDlgItem( ::hWnd, 1040 ), .F. ) ENDIF IF ! ::underscore - WVG_EnableWindow( WVG_GetDlgItem( ::hWnd, 1041 ), .F. ) + Wvg_EnableWindow( Wvg_GetDlgItem( ::hWnd, 1041 ), .F. ) ENDIF IF ! ::name - WVG_EnableWindow( WVG_GetDlgItem( ::hWnd, 1136 ), .F. ) + Wvg_EnableWindow( Wvg_GetDlgItem( ::hWnd, 1136 ), .F. ) ENDIF IF ! ::style - WVG_EnableWindow( WVG_GetDlgItem( ::hWnd, 1137 ), .F. ) + Wvg_EnableWindow( Wvg_GetDlgItem( ::hWnd, 1137 ), .F. ) ENDIF IF ! ::size - WVG_EnableWindow( WVG_GetDlgItem( ::hWnd, 1138 ), .F. ) + Wvg_EnableWindow( Wvg_GetDlgItem( ::hWnd, 1138 ), .F. ) ENDIF IF ::aPos[ 1 ] > 0 .OR. ::aPos[ 2 ] > 0 - aRect := WVG_GetWindowRect( ::hWnd ) - WVG_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 := WVG_LOWORD( nwParam ) - nH := WVG_HIWORD( nwParam ) + nL := Wvg_LOWORD( nwParam ) + nH := Wvg_HIWORD( nwParam ) HB_SYMBOL_UNUSED( nH ) @@ -430,7 +430,7 @@ METHOD display( nMode ) CLASS WvgFontDialog IF nMode == 0 hWnd := ::oParent:hWnd ELSE - hWnd := WVG_GetDesktopWindow() + hWnd := Wvg_GetDesktopWindow() ENDIF ::ok := .F. @@ -460,7 +460,7 @@ METHOD GetWvgFont( aFont ) CLASS WvgFontDialog LOCAL oWvgFont IF ! HB_ISARRAY( aFont ) - aFont := Wvg_ChooseFont_GetLogFont( ::hWnd ) + aFont := Wvg_ChooseFont_GetLOGFont( ::hWnd ) ENDIF oWvgFont := WvgFont():new() @@ -577,7 +577,7 @@ METHOD configure( cFontName ) CLASS WvgFont METHOD destroy() CLASS WvgFont IF ::hFont != NIL - WVG_DeleteObject( ::hFont ) + Wvg_DeleteObject( ::hFont ) ENDIF RETURN Self @@ -597,7 +597,7 @@ METHOD createFont() CLASS WvgFont LOCAL aFont IF ::hFont != NIL - WVG_DeleteObject( ::hFont ) + Wvg_DeleteObject( ::hFont ) ::hFont := NIL ENDIF diff --git a/harbour/contrib/gtwvg/tabpage.prg b/harbour/contrib/gtwvg/tabpage.prg index c1e45e2e34..834bafbd9b 100644 --- a/harbour/contrib/gtwvg/tabpage.prg +++ b/harbour/contrib/gtwvg/tabpage.prg @@ -142,7 +142,7 @@ METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) CLASS WvgTa __defaultNIL( @::caption, " " ) - WAPI_TabCtrl_InsertItem( ::pWnd, 0, ::caption ) + wapi_TabCtrl_InsertItem( ::pWnd, 0, ::caption ) IF ::visible ::show() @@ -186,7 +186,7 @@ METHOD handleEvent( nMessage, aNM ) CLASS WvgTabPage ENDCASE CASE nMessage == HB_GTE_CTLCOLOR - RETURN WVG_GetStockObject( NULL_BRUSH ) + RETURN Wvg_GetStockObject( NULL_BRUSH ) ENDCASE diff --git a/harbour/contrib/gtwvg/tests/activex.prg b/harbour/contrib/gtwvg/tests/activex.prg index 4fae38e370..2a67f6feeb 100644 --- a/harbour/contrib/gtwvg/tests/activex.prg +++ b/harbour/contrib/gtwvg/tests/activex.prg @@ -55,7 +55,7 @@ FUNCTION ExecuteActiveX( nActiveX, xParam ) // --------------------------- StatusBar ---------------------------\\ oSBar := WvgStatusBar():new( oDA ):create( , , , , , .T. ) - oSBar:panelClick := {| oPanel | WVG_MessageBox( , oPanel:caption ) } + oSBar:panelClick := {| oPanel | Wvg_MessageBox( , oPanel:caption ) } oPanel := oSBar:getItem( 1 ) oPanel:caption := "My Root Panel" oPanel1 := oSBar:addItem() @@ -89,7 +89,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, WVG_MessageBox( , obj:caption + iif( obj:selection, "< S >", "< N >" ) ) } + oRadio:selected := {| m1, m2, obj | m1 := m1, m2 := m2, Wvg_MessageBox( , obj:caption + iif( obj:selection, "< S >", "< N >" ) ) } oRadio:create() oRadio := WvgRadioButton():new( oStatic2, , { 10, 35 }, { 100, 15 } ) @@ -99,7 +99,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, WVG_MessageBox( , iif( o:getData(), "I am selected", "I am not selected" ) ) } + oCheck:selected := {| m1, m2, o | m1 := m1, m2 := m2, Wvg_MessageBox( , iif( o:getData(), "I am selected", "I am not selected" ) ) } // Create first 3State button, passing the position to :create() oXbp := Wvg3State():new( oStatic2 ) @@ -113,7 +113,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, WVG_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 @@ -172,7 +172,7 @@ FUNCTION ExecuteActiveX( nActiveX, xParam ) AAdd( aParts, "DataRef" ) AEval( aParts, {| e | oListBox:addItem( e ) } ) - oListBox:itemSelected := {|| WVG_MessageBox( , oListBox:getCurItem() ) } + oListBox:itemSelected := {|| Wvg_MessageBox( , oListBox:getCurItem() ) } oListBox:setData( 3 ) // --------------------------- PushButton --------------------------\\ @@ -191,7 +191,7 @@ FUNCTION ExecuteActiveX( nActiveX, xParam ) oTree:create() oTree:setColorBG( RGB( 120, 15, 240 ) ) oTree:setColorFG( RGB( 15, 240, 120 ) ) - oTree:itemSelected := {| oItem | iif( oItem != NIL, WVG_MessageBox( , oItem:caption ), NIL ) } + oTree:itemSelected := {| oItem | iif( oItem != NIL, Wvg_MessageBox( , oItem:caption ), NIL ) } oItem1 := oTree:rootItem:addItem( "First level A" ) @@ -298,14 +298,14 @@ STATIC FUNCTION ActiveXBuildMenu( oCrt, oStatic, oStatic2 ) oSubMenu:addItem( { "Play Opening ~1", {|| MyFunction( 1 ) } } ) oSubMenu:addItem( { "Play Closing ~2", {|| MyFunction( 2 ) } } ) oSubMenu:addItem() - oSubMenu:addItem( { "~MessageBox" , {|| MyFunction( 3 ) } } ) + oSubMenu:addItem( { "~MessageBox", {|| MyFunction( 3 ) } } ) oMenuBar:addItem( { oSubMenu, NIL } ) oSubMenu := WvgMenu():new( oMenuBar ):create() oSubMenu:title := "F~eatures" - oSubMenu:addItem( { "~Hide or Show Left Panel" , {|| iif( oStatic:isVisible, ; + oSubMenu:addItem( { "~Hide or Show Left Panel", {|| iif( oStatic:isVisible, ; oStatic:hide(), oStatic:show() ), oCrt:sendMessage( WM_SIZE, 0, 0 ) } } ) - oSubMenu:addItem( { "~Show My Panel" , {|| oStatic2:show() } } ) + oSubMenu:addItem( { "~Show My Panel", {|| oStatic2:show() } } ) oMenuBar:addItem( { oSubMenu, NIL } ) RETURN NIL @@ -324,8 +324,8 @@ STATIC FUNCTION BuildActiveXControl( nActiveX, oDA ) CASE nActiveX == 1 hb_gtInfo( HB_GTI_WINTITLE, "Shell.Explorer.2" + " [ " + "http://harbour.vouch.info" + " ]" ) oCom:CLSID := "Shell.Explorer.2" - oCom:mapEvent( 269, {|| WAPI_OutputDebugString( " E X P L O R E R - 2 6 9" ) } ) - oCom:mapEvent( 105, {|| WAPI_OutputDebugString( " E X P L O R E R - 105" ) } ) + oCom:mapEvent( 269, {|| wapi_OutputDebugString( " E X P L O R E R - 2 6 9" ) } ) + oCom:mapEvent( 105, {|| wapi_OutputDebugString( " E X P L O R E R - 105" ) } ) CASE nActiveX == 11 hb_gtInfo( HB_GTI_WINTITLE, "Shell.Explorer.2" + " [ " + "MSHTML Demo" + " ]" ) @@ -656,7 +656,7 @@ STATIC FUNCTION MyFunction( nMode ) Tone( MUSIC_WAITON[ 1 ], 1 ) CASE nMode == 3 - WVG_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 ) } ) diff --git a/harbour/contrib/gtwvg/tests/demowvg.prg b/harbour/contrib/gtwvg/tests/demowvg.prg index 48a2902d00..e8c454bc11 100644 --- a/harbour/contrib/gtwvg/tests/demowvg.prg +++ b/harbour/contrib/gtwvg/tests/demowvg.prg @@ -72,11 +72,11 @@ EXIT PROCEDURE CleanHandles() LOCAL obj FOR EACH obj IN SetFonts() - WVG_DeleteObject( obj ) + Wvg_DeleteObject( obj ) obj := NIL NEXT FOR EACH obj IN SetIcons() - WVG_DeleteObject( obj ) + Wvg_DeleteObject( obj ) obj := NIL NEXT @@ -111,7 +111,7 @@ PROCEDURE Main() Set( _SET_EVENTMASK, INKEY_ALL + HB_INKEY_GTEVENT ) - Wvt_SetGui( .T. ) + Wvt_SetGUI( .T. ) WvtSetKeys( .T. ) Popups( 1 ) Wvt_SetMouseMove( .T. ) @@ -268,7 +268,7 @@ PROCEDURE WvtNextGetsConsole() PROCEDURE WvtNextGets() IF hb_mtvm() - hb_threadStart( {|| hb_gtReload( "WVG" ), Wvt_setFont( "Terminal", 20 ), ; + hb_threadStart( {|| hb_gtReload( "WVG" ), Wvt_SetFont( "Terminal", 20 ), ; hb_clear(), Wvt_ShowWindow( SW_RESTORE ), WvtNextGets_X() } ) ELSE WvtNextGets_X() @@ -316,7 +316,7 @@ PROCEDURE WvtNextGets_X() AAdd( aBlocks, {|| Wvt_DrawBoxGroupRaised( 5, 6, 19, 72 ) } ) AAdd( aBlocks, {|| AEval( GetList, {| oGet | Wvt_DrawBoxGet( oGet:Row, oGet:Col, Len( Transform( oGet:VarGet(), oGet:Picture ) ) ) } ) } ) - AAdd( aBlocks, {|| Wvt_DrawButton( 21, 6, 22, 9, "New","vouch1.bmp" ) } ) + AAdd( aBlocks, {|| Wvt_DrawButton( 21, 6, 22, 9, "New", "vouch1.bmp" ) } ) AAdd( aBlocks, {|| Wvt_DrawButton( 21, 11, 22, 14, "Browse", "vouch1.bmp", 1, rgb( 255, 255, 255 ) ) } ) AAdd( aBlocks, {|| Wvt_DrawButton( 21, 16, 22, 19, , "vouch1.bmp" ) } ) AAdd( aBlocks, {|| Wvt_DrawButton( 21, 21, 22, 24, "Data",, 0, rgb( 100, 22, 241 ), rgb( 198, 198, 198 ) ) } ) diff --git a/harbour/contrib/gtwvg/tests/demowvg1.prg b/harbour/contrib/gtwvg/tests/demowvg1.prg index 5c6239e59c..24882ebd1e 100644 --- a/harbour/contrib/gtwvg/tests/demowvg1.prg +++ b/harbour/contrib/gtwvg/tests/demowvg1.prg @@ -38,7 +38,7 @@ PROCEDURE Main() SET DATE ANSI Set( _SET_EVENTMASK, INKEY_ALL + HB_INKEY_GTEVENT ) - Wvt_SetGui( .T. ) + Wvt_SetGUI( .T. ) Wvt_SetFont( "Courier New", 18, 0, 0 ) Wvt_SetMouseMove( .T. ) @@ -52,15 +52,15 @@ PROCEDURE Main() aPaint := {} - AAdd( aPaint, { "Label" , {|| Wvt_DrawLabel( 1, 40, "Harbour Console GUI Demo", 6, , rgb( 255,255,255 ), rgb( 198,198,198 ), "Arial", 26, , , , , .T., .T. ) } , { WVT_BLOCK_LABEL, 1, 10, 3, 50 } } ) - AAdd( aPaint, { "Box_1" , {|| Wvt_DrawBoxRaised( 4, 4, 20, 75 ) } , { WVT_BLOCK_BOX , 4, 4, 20, 75 } } ) - AAdd( aPaint, { "Box_2" , {|| Wvt_DrawBoxRecessed( 7, 61, 13, 70 ) } , { WVT_BLOCK_BOX , 7, 61, 13, 70 } } ) - AAdd( aPaint, { "Box_3" , {|| Wvt_DrawBoxGroup( 15, 59, 18, 72 ) } , { WVT_BLOCK_BOX , 15, 59, 18, 72 } } ) - AAdd( aPaint, { "Box_4" , {|| Wvt_DrawBoxGroup( 5, 6, 19, 44 ) } , { WVT_BLOCK_BOX , 5, 6, 19, 44 } } ) - AAdd( aPaint, { "Image" , {|| Wvt_DrawImage( 8,62,12,69, IMAGE_VOUCH ) } , { WVT_BLOCK_IMAGE, 8, 62, 12, 69 } } ) - AAdd( aPaint, { "Box_5" , {|| Wvt_DrawBoxRecessed( 7, 48, 13, 55 ) } , { WVT_BLOCK_BOX , 7, 48, 13, 55 } } ) - AAdd( aPaint, { "Line_1", {|| Wvt_DrawLine( MaxRow() - 2, 0, MaxRow() - 2, MaxCol(), WVT_LINE_HORZ, WVT_LINE_RECESSED, WVT_LINE_BOTTOM ) } , NIL } ) - AAdd( aPaint, { "Gets" , {|| AEval( GetList, {| oGet | Wvt_DrawBoxGet( oGet:Row, oGet:Col, Len( Transform( oGet:VarGet(), oGet:Picture ) ) ) } ) }, NIL } ) + AAdd( aPaint, { "Label", {|| Wvt_DrawLabel( 1, 40, "Harbour Console GUI Demo", 6, , rgb( 255, 255, 255 ), rgb( 198, 198, 198 ), "Arial", 26, , , , , .T., .T. ) }, { WVT_BLOCK_LABEL, 1, 10, 3, 50 } } ) + AAdd( aPaint, { "Box_1", {|| Wvt_DrawBoxRaised( 4, 4, 20, 75 ) }, { WVT_BLOCK_BOX, 4, 4, 20, 75 } } ) + AAdd( aPaint, { "Box_2", {|| Wvt_DrawBoxRecessed( 7, 61, 13, 70 ) }, { WVT_BLOCK_BOX, 7, 61, 13, 70 } } ) + AAdd( aPaint, { "Box_3", {|| Wvt_DrawBoxGroup( 15, 59, 18, 72 ) }, { WVT_BLOCK_BOX, 15, 59, 18, 72 } } ) + AAdd( aPaint, { "Box_4", {|| Wvt_DrawBoxGroup( 5, 6, 19, 44 ) }, { WVT_BLOCK_BOX, 5, 6, 19, 44 } } ) + AAdd( aPaint, { "Image", {|| Wvt_DrawImage( 8, 62, 12, 69, IMAGE_VOUCH ) }, { WVT_BLOCK_IMAGE, 8, 62, 12, 69 } } ) + AAdd( aPaint, { "Box_5", {|| Wvt_DrawBoxRecessed( 7, 48, 13, 55 ) }, { WVT_BLOCK_BOX, 7, 48, 13, 55 } } ) + AAdd( aPaint, { "Line_1", {|| Wvt_DrawLine( MaxRow() - 2, 0, MaxRow() - 2, MaxCol(), WVT_LINE_HORZ, WVT_LINE_RECESSED, WVT_LINE_BOTTOM ) }, NIL } ) + AAdd( aPaint, { "Gets", {|| AEval( GetList, {| oGet | Wvt_DrawBoxGet( oGet:Row, oGet:Col, Len( Transform( oGet:VarGet(), oGet:Picture ) ) ) } ) }, NIL } ) ExecForm( aPaint ) diff --git a/harbour/contrib/gtwvg/tests/demoxbp.prg b/harbour/contrib/gtwvg/tests/demoxbp.prg index 91587930b2..4a0b446db3 100644 --- a/harbour/contrib/gtwvg/tests/demoxbp.prg +++ b/harbour/contrib/gtwvg/tests/demoxbp.prg @@ -53,7 +53,7 @@ PROCEDURE Main() // --------------------------- StatusBar ---------------------------\\ oSBar := WvgStatusBar():new( oCrt ):create( , , , , , .T. ) - oSBar:panelClick := {| oPanel | WVG_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 @@ PROCEDURE Main() AAdd( aParts, "DataRef" ) AEval( aParts, {| e | oListBox:addItem( e ) } ) - oListBox:itemSelected := {|| WVG_MessageBox( , oListBox:getCurItem() ) } + oListBox:itemSelected := {|| Wvg_MessageBox( , oListBox:getCurItem() ) } oListBox:setData( 3 ) // show selected "XbpToolBar" // --------------------------- PushButton --------------------------\\ @@ -122,7 +122,7 @@ PROCEDURE Main() oTree:create() oTree:setColorBG( RGB( 120, 15, 240 ) ) oTree:setColorFG( RGB( 15, 240, 120 ) ) - oTree:itemSelected := {| oItem | iif( oItem != NIL, WVG_MessageBox( , oItem:caption ), NIL ) } + oTree:itemSelected := {| oItem | iif( oItem != NIL, Wvg_MessageBox( , oItem:caption ), NIL ) } oItem1 := oTree:rootItem:addItem( "First level A" ) @@ -150,7 +150,7 @@ PROCEDURE Main() oCom:CLSID := "Shell.Explorer.2" oCom:mapEvent( 269, {|| QOut( " E X P L O R E R - 2 6 9" ) } ) #else - oCom := WvgHTMLViewer():New( oDA, , { 0, 0 }, { 100, 100 }, , .T. ) + 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 } #endif @@ -185,7 +185,7 @@ PROCEDURE 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, WVG_MessageBox( , obj:caption + iif( obj:selection, "< S >", "< N >" ) ) } + oRadio:selected := {| m1, m2, obj | m1 := m1, m2 := m2, Wvg_MessageBox( , obj:caption + iif( obj:selection, "< S >", "< N >" ) ) } oRadio:create() oRadio := WvgRadioButton():new( oStatic2, , { 10, 35 }, { 100, 15 } ) @@ -195,7 +195,7 @@ PROCEDURE 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, WVG_MessageBox( , iif( o:getData(), "I am selected", "I am not selected" ) ) } + oCheck:selected := {| m1, m2, o | m1 := m1, m2 := m2, Wvg_MessageBox( , iif( 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 @@ PROCEDURE Main() oXbp:caption := "3 State B" oXbp:create( oStatic2 ) // Determine current state using :getData() - oXbp:selected := {| m1, m2, oBtn | m1 := m1, m2 := m2, WVG_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 @@ -388,7 +388,7 @@ STATIC FUNCTION MyFunctionXbp( nMode ) Tone( MUSIC_WAITON[ 1 ], 1 ) CASE nMode == 3 - WVG_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 ) } ) diff --git a/harbour/contrib/gtwvg/tests/dyndlgs.prg b/harbour/contrib/gtwvg/tests/dyndlgs.prg index 25d200fe80..2782e1b28f 100644 --- a/harbour/contrib/gtwvg/tests/dyndlgs.prg +++ b/harbour/contrib/gtwvg/tests/dyndlgs.prg @@ -145,71 +145,71 @@ FUNCTION DynDlgProc( hDlg, nMsg, wParam, lParam ) SWITCH nMsg CASE WM_TIMER - WVG_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 := ( WVG_IsDlgButtonChecked( hDlg, ID_CHK_SATIS ) == 1 ) - WVG_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 - WVG_MessageBox( hDlg, "Harbour", "Compiler" ) + Wvg_MessageBox( hDlg, "Harbour", "Compiler" ) CASE wParam == ID_RDO_CLIP - WVG_MessageBox( hDlg, "Clipper", "Compiler" ) + Wvg_MessageBox( hDlg, "Clipper", "Compiler" ) CASE wParam == ID_RDO_XBASE - WVG_MessageBox( hDlg, "Xbase++", "Compiler" ) + Wvg_MessageBox( hDlg, "Xbase++", "Compiler" ) CASE wParam == ID_MNU_FILE - WVG_MessageBox( hDlg, "Execute Menu Action!", "File" ) + Wvg_MessageBox( hDlg, "Execute Menu Action!", "File" ) CASE wParam == ID_MNU_CONTROL - WVG_MessageBox( hDlg, "Controls are from Windows!", "Controls" ) + Wvg_MessageBox( hDlg, "Controls are from Windows!", "Controls" ) - 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 ) + 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 ) - WVG_SendMessage( WVG_GetDlgItem( hDlg, ID_LST_LIST ), LB_GETTEXT, nIndex, @cPrompt ) - WVG_MessageBox( hDlg, cPrompt, "ListBox" ) + Wvg_SendMessage( Wvg_GetDlgItem( hDlg, ID_LST_LIST ), LB_GETTEXT, nIndex, @cPrompt ) + Wvg_MessageBox( hDlg, cPrompt, "ListBox" ) ENDIF - 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 ) + 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 ) - WVG_SendMessage( WVG_GetDlgItem( hDlg, ID_CMB_COMBO ), CB_GETLBTEXT, nIndex, @cPrompt ) - WVG_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 WVG_GetDlgItem( hDlg, ID_MLE ) == lParam - WVG_SetTextColor( wParam, RGB( 0, 0, 255 ) ) - WVG_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 WVG_GetDlgItem( hDlg, ID_EDT_TEXT ) == lParam - WVG_SetTextColor( wParam, RGB( 255, 255, 255 ) ) - WVG_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 WVG_GetDlgItem( hDlg, ID_STA_TEXT ) == lParam - WVG_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 - WVG_SetTimer( hDlg, 5001, 1000 ) // 1 sec + Wvg_SetTimer( hDlg, 5001, 1000 ) // 1 sec IF Empty( aHFonts := SetFonts() ) IF ( hFont := Wvt_CreateFont( "Times New Roman", 18 ) ) != 0 @@ -218,14 +218,14 @@ FUNCTION DynDlgProc( hDlg, nMsg, wParam, lParam ) ENDIF IF Len( aHFonts ) > 0 - WVG_SendMessage( WVG_GetDlgItem( hDlg, ID_MLE ), WM_SETFONT, ahFonts[ 1 ], 0 ) + Wvg_SendMessage( Wvg_GetDlgItem( hDlg, ID_MLE ), WM_SETFONT, ahFonts[ 1 ], 0 ) ENDIF IF Empty( SetIcons() ) - SetIcons( WVG_LoadIcon( "vr_1.ico" ) ) + SetIcons( Wvg_LoadIcon( "vr_1.ico" ) ) ENDIF IF ! Empty( SetIcons() ) - WVG_SendMessage( WVG_GetDlgItem( hDlg, ID_ICO_VOUCH ), STM_SETIMAGE, IMAGE_ICON, SetIcons()[ 1 ] ) + Wvg_SendMessage( Wvg_GetDlgItem( hDlg, ID_ICO_VOUCH ), STM_SETIMAGE, IMAGE_ICON, SetIcons()[ 1 ] ) ENDIF /* @@ -236,10 +236,10 @@ FUNCTION DynDlgProc( hDlg, nMsg, wParam, lParam ) WVG_SendMessage( WVG_GetDlgItem( hDlg, ID_STA_IMAGE ), STM_SETIMAGE, IMAGE_BITMAP, t_hImage ) ENDIF */ - WVG_SetDlgItemText( hDlg, ID_MLE , GetEditText() ) - WVG_CheckDlgButton( hDlg, ID_CHK_SATIS, .T. ) + Wvg_SetDlgItemText( hDlg, ID_MLE, GetEditText() ) + Wvg_CheckDlgButton( hDlg, ID_CHK_SATIS, .T. ) - WVG_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, "Harbour" ) Wvt_LBAddString( hDlg, ID_LST_LIST, "Gtwvt" ) @@ -258,7 +258,7 @@ FUNCTION DynDlgProc( hDlg, nMsg, wParam, lParam ) Wvt_CBSetCurSel( hDlg, ID_CMB_COMBO, 1 ) - WVG_InvalidateRect( hDlg ) + Wvg_InvalidateRect( hDlg ) EXIT @@ -267,7 +267,7 @@ FUNCTION DynDlgProc( hDlg, nMsg, wParam, lParam ) // Each box will retrieve its own text. // /* cText := */ - WVG_GetDlgItemText( hDlg, ID_MLE ) + Wvg_GetDlgItemText( hDlg, ID_MLE ) EXIT ENDSWITCH @@ -359,14 +359,14 @@ FUNCTION DrawSlide( hDlg, nSlide ) LOCAL hDC, aRect - hDC := WVG_GetDC( hDlg ) - aRect := WVG_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 ) - WVG_DrawImage( hDC, aRect[ 1 ] + 10, aRect[ 2 ] + 10, aRect[ 3 ] - aRect[ 1 ] - 20, ; + win_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 ] ) - WVG_ReleaseDC( hDlg, hDC ) + Wvg_ReleaseDC( hDlg, hDC ) RETURN NIL diff --git a/harbour/contrib/gtwvg/tests/tbrowser.prg b/harbour/contrib/gtwvg/tests/tbrowser.prg index f44f763937..fcabc15cf0 100644 --- a/harbour/contrib/gtwvg/tests/tbrowser.prg +++ b/harbour/contrib/gtwvg/tests/tbrowser.prg @@ -46,7 +46,7 @@ FUNCTION WvtMyBrowse() oCrt:resizeMode := HB_GTI_RESIZEMODE_ROWS, ; oCrt:icon := GetResource( "dia_excl.ico" ), ; oCrt:create(), ; - Wvt_SetGui( .T. ), ; + Wvt_SetGUI( .T. ), ; ExecBrowser( oCrt ), ; oCrt:destroy(); } ) @@ -315,7 +315,7 @@ STATIC FUNCTION BrwBuildTree( oCrt /*, oBrw*/ ) oTree:create( , , { -24, -1 }, { {|| -( MaxRow() - 1 - 24 ) }, -10 } ) oTree:setColorFG( "W+" ) oTree:setColorBG( "R*" ) - oTree:itemSelected := {| oItem | WVG_MessageBox( , iif( oItem != NIL, oItem:caption, "Some Problem" ) ) } + oTree:itemSelected := {| oItem | Wvg_MessageBox( , iif( oItem != NIL, oItem:caption, "Some Problem" ) ) } oItem1 := oTree:rootItem:addItem( "First level A" ) @@ -1021,7 +1021,7 @@ FUNCTION ConfigBrowser( aFields, cUseAlias, aTLBR, cDesc, oParent, cColorSpec, n SELECT( cUseAlias ) info_ := dbStruct() - oBrowse := TBrowseWVG():New( aTLBR[ 1 ], aTLBR[ 2 ], aTLBR[ 3 ], aTLBR[ 4 ] ) + oBrowse := TBrowseWvg():New( aTLBR[ 1 ], aTLBR[ 2 ], aTLBR[ 3 ], aTLBR[ 4 ] ) oBrowse:ColSep := " " oBrowse:HeadSep := "__" diff --git a/harbour/contrib/gtwvg/tests/utils.prg b/harbour/contrib/gtwvg/tests/utils.prg index 203f4dfb81..a3cc31daa6 100644 --- a/harbour/contrib/gtwvg/tests/utils.prg +++ b/harbour/contrib/gtwvg/tests/utils.prg @@ -290,7 +290,7 @@ FUNCTION WvtWindowExpand( nUnits ) s_nUnits += nUnits - Wvt_setFont( "Courier New", s_nUnits ) + Wvt_SetFont( "Courier New", s_nUnits ) RETURN .T. @@ -546,7 +546,7 @@ FUNCTION uiDebug( ... ) AEval( aP, {| e | s += hb_ValToStr( e ) + " " } ) - WAPI_OutputDebugString( s ) + wapi_OutputDebugString( s ) RETURN NIL diff --git a/harbour/contrib/gtwvg/tests/wvtcls.prg b/harbour/contrib/gtwvg/tests/wvtcls.prg index 60e325e25a..e62f3dbbf9 100644 --- a/harbour/contrib/gtwvg/tests/wvtcls.prg +++ b/harbour/contrib/gtwvg/tests/wvtcls.prg @@ -130,7 +130,7 @@ STATIC FUNCTION MyDialogOne( oCrt ) oImg:Tooltip := "WvtImage():New()" oDlg:AddObject( oImg ) - oTBar := WvtToolbar():New( oDlg, 103, 0, 0, 2 ) + oTBar := WvtToolBar():New( oDlg, 103, 0, 0, 2 ) oTBar:lFloating := .F. oTBar:Tooltip := "Toolbar" oTBar:AddButton( aImg_[ 1 ], {|| oImg:SetImage( aImg_[ 1 ] ) }, "Lock" ) @@ -350,7 +350,7 @@ FUNCTION DialogWvgClassesTwo() LOCAL oPBar1, oPBar2, oPBar3, oPBar4 g_oMenuBar := WvtMenu():new():create() - oMenu := wvtMenu():new():create() + oMenu := WvtMenu():new():create() oMenu:Caption := "Miscellaneous" oMenu:AddItem( "Progressbar", {|| ExeProgBar( oPBar, oPBar1, oPBar2, oPBar3, oPBar4 ) } ) oMenu:AddItem( "-" ) diff --git a/harbour/contrib/gtwvg/tests/xbp.prg b/harbour/contrib/gtwvg/tests/xbp.prg index f2e6b99c79..da306794ce 100644 --- a/harbour/contrib/gtwvg/tests/xbp.prg +++ b/harbour/contrib/gtwvg/tests/xbp.prg @@ -51,7 +51,7 @@ FUNCTION demoxbp() // --------------------------- StatusBar ---------------------------\\ oSBar := WvgStatusBar():new( oCrt ):create( , , , , , .T. ) - oSBar:panelClick := {| oPanel | WVG_MessageBox( , oPanel:caption ) } + oSBar:panelClick := {| oPanel | Wvg_MessageBox( , oPanel:caption ) } oPanel := oSBar:getItem( 1 ) oPanel:caption := "My Root Panel" oPanel1 := oSBar:addItem() @@ -100,7 +100,7 @@ FUNCTION demoxbp() AAdd( aParts, "DataRef" ) AEval( aParts, {| e | oListBox:addItem( e ) } ) - oListBox:itemSelected := {|| WVG_MessageBox( , oListBox:getCurItem() ) } + oListBox:itemSelected := {|| Wvg_MessageBox( , oListBox:getCurItem() ) } oListBox:setData( 3 ) // show selected "XbpToolBar" // --------------------------- PushButton --------------------------\\ @@ -120,7 +120,7 @@ FUNCTION demoxbp() oTree:create() oTree:setColorBG( RGB( 120, 15, 240 ) ) oTree:setColorFG( RGB( 15, 240, 120 ) ) - oTree:itemSelected := {| oItem | iif( oItem != NIL, WVG_MessageBox( , oItem:caption ), NIL ) } + oTree:itemSelected := {| oItem | iif( oItem != NIL, Wvg_MessageBox( , oItem:caption ), NIL ) } oItem1 := oTree:rootItem:addItem( "First level A" ) @@ -148,7 +148,7 @@ FUNCTION demoxbp() oCom:CLSID := "Shell.Explorer.2" oCom:mapEvent( 269, {|| QOut( " E X P L O R E R - 2 6 9" ) } ) #else - oCom := WvgHTMLViewer():New( oDA, , { 0, 0 }, { 100, 100 }, , .T. ) + 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" } ) @@ -184,7 +184,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, WVG_MessageBox( , obj:caption + iif( obj:selection, "< S >", "< N >" ) ) } + oRadio:selected := {| m1, m2, obj | m1 := m1, m2 := m2, Wvg_MessageBox( , obj:caption + iif( obj:selection, "< S >", "< N >" ) ) } oRadio:create() oRadio := WvgRadioButton():new( oStatic2, , { 10, 35 }, { 100, 15 } ) @@ -194,7 +194,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, WVG_MessageBox( , iif( o:getData(), "I am selected", "I am not selected" ) ) } + oCheck:selected := {| m1, m2, o | m1 := m1, m2 := m2, Wvg_MessageBox( , iif( o:getData(), "I am selected", "I am not selected" ) ) } // Create first 3State button, passing the position to :create() oXbp := Wvg3State():new() @@ -208,7 +208,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, WVG_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 @@ -385,7 +385,7 @@ STATIC FUNCTION MyFunctionXbp( nMode ) Tone( MUSIC_WAITON[ 1 ], 1 ) CASE nMode == 3 - WVG_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 ) } ) diff --git a/harbour/contrib/gtwvg/toolbar.prg b/harbour/contrib/gtwvg/toolbar.prg index c839a75079..d82c46eb3d 100644 --- a/harbour/contrib/gtwvg/toolbar.prg +++ b/harbour/contrib/gtwvg/toolbar.prg @@ -187,7 +187,7 @@ METHOD WvgToolBar:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) IF ! Empty( ::hWnd ) ::SendToolbarMessage( TB_BUTTONSTRUCTSIZE ) - ::hImageList := WAPI_ImageList_Create( ::imageWidth, ::imageHeight, ILC_COLOR32 + ILC_MASK, 0, 1 ) + ::hImageList := wapi_ImageList_Create( ::imageWidth, ::imageHeight, ILC_COLOR32 + ILC_MASK, 0, 1 ) ::SendToolbarMessage( TB_SETIMAGELIST, ::hImageList ) ::SendToolbarMessage( TB_BUTTONSTRUCTSIZE ) @@ -254,19 +254,19 @@ METHOD WvgToolBar:destroy() IF ( nItems := Len( ::aItems ) ) > 0 FOR i := 1 TO nItems IF ::aItems[ i, 2 ]:image != NIL - WVG_DeleteObject( ::aItems[ i, 2 ]:image ) + Wvg_DeleteObject( ::aItems[ i, 2 ]:image ) ENDIF IF ::aItems[ i, 2 ]:disabledImage != NIL - WVG_DeleteObject( ::aItems[ i, 2 ]:disabledImage ) + Wvg_DeleteObject( ::aItems[ i, 2 ]:disabledImage ) ENDIF IF ::aItems[ i, 2 ]:hotImage != NIL - WVG_DeleteObject( ::aItems[ i, 2 ]:hotImage ) + Wvg_DeleteObject( ::aItems[ i, 2 ]:hotImage ) ENDIF NEXT ENDIF IF ! Empty( ::hImageList ) - WAPI_ImageList_Destroy( ::hImageList ) + wapi_ImageList_Destroy( ::hImageList ) ENDIF ::wvgWindow:destroy() @@ -285,7 +285,7 @@ METHOD WvgToolBar:configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible METHOD WvgToolBar:sendToolbarMessage( nMsg, p1, p2 ) - RETURN WVG_SendToolbarMessage( ::pWnd, nMsg, p1, p2 ) + RETURN Wvg_SendToolBarMessage( ::pWnd, nMsg, p1, p2 ) // @@ -305,7 +305,7 @@ METHOD WvgToolBar:addItem( cCaption, xImage, xDisabledImage, xHotImage, cDLL, nS ::lSized := .T. ENDIF - oBtn := WvgToolbarButton():new( cCaption, nStyle, cKey ) + oBtn := WvgToolBarButton():new( cCaption, nStyle, cKey ) oBtn:index := ::numItems + 1 oBtn:command := 100 + oBtn:index @@ -324,7 +324,7 @@ METHOD WvgToolBar:addItem( cCaption, xImage, xDisabledImage, xHotImage, cDLL, nS EXIT CASE "N" - pBitmap := Wvg_PrepareBitmapFromResourceID( xImage, ::imageWidth, ::imageHeight, .T., ::hWnd ) + pBitmap := Wvg_PrepareBitmapFromResourceId( xImage, ::imageWidth, ::imageHeight, .T., ::hWnd ) EXIT CASE "P" @@ -337,15 +337,15 @@ METHOD WvgToolBar:addItem( cCaption, xImage, xDisabledImage, xHotImage, cDLL, nS /* oBtn:image := pBitmap */ IF HB_ISNUMERIC( nMapRGB ) - nBtn := WAPI_ImageList_AddMasked( ::hImageList, pBitmap, nMapRGB ) + nBtn := wapi_ImageList_AddMasked( ::hImageList, pBitmap, nMapRGB ) ELSE - nBtn := WAPI_ImageList_Add( ::hImageList, pBitmap ) + nBtn := wapi_ImageList_Add( ::hImageList, pBitmap ) ENDIF IF ! HB_ISPOINTER( xImage ) - WVG_DeleteObject( pBitmap ) + Wvg_DeleteObject( pBitmap ) ENDIF - WVG_AddToolbarButton( ::pWnd, nBtn, oBtn:caption, oBtn:command, 1, ::showToolTips ) + Wvg_AddToolBarButton( ::pWnd, nBtn, oBtn:caption, oBtn:command, 1, ::showToolTips ) /* Set Button Size */ ::SendToolbarMessage( TB_SETBUTTONSIZE, ::buttonWidth, ::buttonHeight ) @@ -356,7 +356,7 @@ METHOD WvgToolBar:addItem( cCaption, xImage, xDisabledImage, xHotImage, cDLL, nS #endif ::sendToolbarMessage( TB_AUTOSIZE ) ELSE - Wvg_AddToolbarButton( ::pWnd, , , oBtn:command, 3, .F. ) + Wvg_AddToolBarButton( ::pWnd, , , oBtn:command, 3, .F. ) ENDIF @@ -500,9 +500,9 @@ ENDCLASS METHOD WvgToolBarButton:new( cCaption, nStyle, cKey ) - __defaultNIL( @cCaption , ::caption ) - __defaultNIL( @nStyle , ::style ) - __defaultNIL( @cKey , ::key ) + __defaultNIL( @cCaption, ::caption ) + __defaultNIL( @nStyle, ::style ) + __defaultNIL( @cKey, ::key ) ::caption := cCaption ::style := nStyle diff --git a/harbour/contrib/gtwvg/treeview.prg b/harbour/contrib/gtwvg/treeview.prg index 00c4fa90d8..82b8eefb58 100644 --- a/harbour/contrib/gtwvg/treeview.prg +++ b/harbour/contrib/gtwvg/treeview.prg @@ -114,9 +114,9 @@ CREATE CLASS WvgTreeView INHERIT WvgWindow, WvgDataRef VAR textItemSelected INIT "" METHOD getSelectionInfo( nlParam ) - METHOD setColorFG( nRGB ) INLINE WVG_TreeView_SetTextColor( ::hWnd, iif( HB_ISSTRING( nRGB ), Wvt_GetRGBColorByString( nRGB, 0 ), nRGB ) ) - METHOD setColorBG( nRGB ) INLINE WVG_TreeView_SetBkColor( ::hWnd, iif( HB_ISSTRING( nRGB ), Wvt_GetRGBColorByString( nRGB, 1 ), nRGB ) ) - METHOD setColorLines( nRGB ) INLINE WVG_TreeView_SetLineColor( ::hWnd, nRGB ) + METHOD setColorFG( nRGB ) INLINE Wvg_TreeView_SetTextColor( ::hWnd, iif( HB_ISSTRING( nRGB ), Wvt_GetRGBColorByString( nRGB, 0 ), nRGB ) ) + METHOD setColorBG( nRGB ) INLINE Wvg_TreeView_SetBkColor( ::hWnd, iif( HB_ISSTRING( nRGB ), Wvt_GetRGBColorByString( nRGB, 1 ), nRGB ) ) + METHOD setColorLines( nRGB ) INLINE Wvg_TreeView_SetLineColor( ::hWnd, nRGB ) METHOD showExpanded( lExpanded, nLevels ) INLINE Wvg_TreeView_ShowExpanded( ::hWnd, ; iif( HB_ISNIL( lExpanded ), .F., lExpanded ), nLevels ) @@ -386,7 +386,7 @@ CREATE CLASS WvgTreeViewItem METHOD configure() METHOD destroy() - METHOD expand( lExpand ) INLINE WVG_TreeView_Expand( ::hTree, ::hItem, ; + METHOD Expand( lExpand ) INLINE Wvg_TreeView_Expand( ::hTree, ::hItem, ; iif( HB_ISLOGICAL( lExpand ), lExpand, .T. ) ) METHOD isExpanded() METHOD setCaption( cCaption ) diff --git a/harbour/contrib/hbformat/hbfmtcls.prg b/harbour/contrib/hbformat/hbfmtcls.prg index d5d3ba38ba..d65719ed9f 100644 --- a/harbour/contrib/hbformat/hbfmtcls.prg +++ b/harbour/contrib/hbformat/hbfmtcls.prg @@ -171,20 +171,24 @@ METHOD New( aParams, cIniName ) CLASS HBFORMATCODE IF !( Right( ::cCommands, 1 ) == "," ) ::cCommands += "," ENDIF - ::cCommands += "IF,ELSE,ELSEIF,END,ENDIF,DO,WHILE,ENDDO,WITH,CASE,OTHERWISE,ENDCASE,BEGIN,ANNOUNCE,REQUEST,THREAD,DYNAMIC,EXTERNAL," + ; - "FUNCTION,PROCEDURE,RETURN,CLASS,ENDCLASS,METHOD,DATA,LOCAL,PRIVATE,PUBLIC,STATIC,FIELD,MEMVAR,PARAMETERS,DECLARE," + ; - "ACCEPT,APPEND,AVERAGE,CLEAR,CLOSE,COMMIT,CONTINUE,COPY,COUNT,CREATE,DEFAULT," + ; - "DELETE,DISPLAY,EJECT,ERASE,EXIT,FOR,GO,GOTO,INDEX,INIT,INPUT,JOIN,KEYBOARD,LABEL,LIST,LOCATE," + ; - "LOOP,MENU,NEXT,PACK,PRINT,QUIT,READ,RECALL,REINDEX,RELEASE,RENAME,REQUEST,REPLACE,RESTORE," + ; - "RUN,SAVE,SEEK,SELECT,SET,SKIP,SORT,STORE,SUM,TEXT,TOTAL,UNLOCK,USE,VAR,WAIT,ZAP," + + ::cCommands += ; + "IF,ELSE,ELSEIF,END,ENDIF,DO,WHILE,ENDDO,WITH,CASE,OTHERWISE,ENDCASE,BEGIN,ANNOUNCE,REQUEST,THREAD,DYNAMIC,EXTERNAL," + ; + "FUNCTION,PROCEDURE,RETURN,CLASS,ENDCLASS,METHOD,DATA,LOCAL,PRIVATE,PUBLIC,STATIC,FIELD,MEMVAR,PARAMETERS,DECLARE," + ; + "ACCEPT,APPEND,AVERAGE,CLEAR,CLOSE,COMMIT,CONTINUE,COPY,COUNT,CREATE,DEFAULT," + ; + "DELETE,DISPLAY,EJECT,ERASE,EXIT,FOR,GO,GOTO,INDEX,INIT,INPUT,JOIN,KEYBOARD,LABEL,LIST,LOCATE," + ; + "LOOP,MENU,NEXT,PACK,PRINT,QUIT,READ,RECALL,REINDEX,RELEASE,RENAME,REQUEST,REPLACE,RESTORE," + ; + "RUN,SAVE,SEEK,SELECT,SET,SKIP,SORT,STORE,SUM,TEXT,TOTAL,UNLOCK,USE,VAR,WAIT,ZAP," IF !( Right( ::cClauses, 1 ) == "," ) ::cClauses += "," ENDIF - ::cClauses += "ADDITIVE,ALIAS,ALL,BLANK,BOTTOM,BOX,COLOR,DATE,DELETED,EACH,EXTENDED,EXCLUSIVE,FROM,GET," + ; - "RANGE,READONLY,REST,SAY,SCREEN,ALTERNATE,BELL,CENTURY,CONFIRM,CONSOLE,CURSOR,DECIMALS,DELIMITERS,DEVICE,EPOCH,ESCAPE," + ; - "EXACT,EXCLUSIVE,FILTER,FIXED,FORMAT,INHERIT,INTENSITY,KEY,LIKE,MARGIN,MESSAGE,NEW,NIL,OFF,ON,ORDER,PATH,PICTURE,PRINTER,PROMPT," + ; - "PROTECTED,RELATION,SCOREBOARD,SEQUENCE,SOFTSEEK,STEP,STRUCTURE,TYPEAHEAD,UNIQUE,WRAP,TAG,TO,TOP,VALID,WHEN," + + ::cClauses += ; + "ADDITIVE,ALIAS,ALL,BLANK,BOTTOM,BOX,COLOR,DATE,DELETED,EACH,EXTENDED,EXCLUSIVE,FROM,GET," + ; + "RANGE,READONLY,REST,SAY,SCREEN,ALTERNATE,BELL,CENTURY,CONFIRM,CONSOLE,CURSOR,DECIMALS,DELIMITERS,DEVICE,EPOCH,ESCAPE," + ; + "EXACT,EXCLUSIVE,FILTER,FIXED,FORMAT,INHERIT,INTENSITY,KEY,LIKE,MARGIN,MESSAGE,NEW,NIL,OFF,ON,ORDER,PATH,PICTURE,PRINTER,PROMPT," + ; + "PROTECTED,RELATION,SCOREBOARD,SEQUENCE,SOFTSEEK,STEP,STRUCTURE,TYPEAHEAD,UNIQUE,WRAP,TAG,TO,TOP,VALID,WHEN," IF !( Right( ::cFunctions, 1 ) == "," ) ::cFunctions += "," diff --git a/harbour/contrib/xhb/xhb.hbx b/harbour/contrib/xhb/xhb.hbx index 8d96ba7397..818305a48e 100644 --- a/harbour/contrib/xhb/xhb.hbx +++ b/harbour/contrib/xhb/xhb.hbx @@ -384,7 +384,7 @@ DYNAMIC TCGIFile DYNAMIC ThreadGetCurrent DYNAMIC ThreadGetCurrentInternal DYNAMIC ThreadSleep -DYNAMIC THROW +DYNAMIC Throw DYNAMIC THtml DYNAMIC THtmlControl DYNAMIC THtmlForm @@ -464,7 +464,7 @@ DYNAMIC xhb_SetTraceFile DYNAMIC xhb_SetTraceStack DYNAMIC xhb_TMemoEditor DYNAMIC xhb_Trim -DYNAMIC xhb__KEYBOARD +DYNAMIC xhb__Keyboard DYNAMIC XIsPrinter DYNAMIC _Array DYNAMIC _Block