From 50a4f031db3b2b9e00a7dfbcaa54dc76fd005263 Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Thu, 26 Nov 2009 22:12:44 +0000 Subject: [PATCH] 2009-11-26 14:09 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * contrib/gtwvg/tests/demowvg.prg ! Removed all hb_ToOutDebug() calls. * contrib/gtwvg/tests/demoxbp.prg ! Removed all hb_ToOutDebug() calls. * contrib/hbide/hbide.prg ! Few more artifacts fixed. * contrib/xhb/Makefile ! Reverted back to original before my last commit. --- harbour/ChangeLog | 13 +++++ harbour/contrib/gtwvg/tests/demowvg.prg | 71 ++----------------------- harbour/contrib/gtwvg/tests/demoxbp.prg | 1 - harbour/contrib/hbide/hbide.prg | 30 ++++------- harbour/contrib/xhb/Makefile | 2 +- 5 files changed, 28 insertions(+), 89 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 96df31fa38..fd72cf04ba 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,19 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-11-26 14:09 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) + * contrib/gtwvg/tests/demowvg.prg + ! Removed all hb_ToOutDebug() calls. + + * contrib/gtwvg/tests/demoxbp.prg + ! Removed all hb_ToOutDebug() calls. + + * contrib/hbide/hbide.prg + ! Few more artifacts fixed. + + * contrib/xhb/Makefile + ! Reverted back to original before my last commit. + 2009-11-26 22:35 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/src/vm/hvm.c ! fixed typo in HB_TRACE message - thanks to Tamas for the info. diff --git a/harbour/contrib/gtwvg/tests/demowvg.prg b/harbour/contrib/gtwvg/tests/demowvg.prg index 469553dd35..f5f5225128 100644 --- a/harbour/contrib/gtwvg/tests/demowvg.prg +++ b/harbour/contrib/gtwvg/tests/demowvg.prg @@ -35,10 +35,6 @@ REQUEST DbfCdx REQUEST DbfNtx -#ifndef __DBG_PARTS__ -//#xtranslate hb_ToOutDebug( [] ) => -#endif - //-------------------------------------------------------------------// // // WvtSetObjects() array structure @@ -2707,7 +2703,7 @@ STATIC FUNCTION BuildActiveXControl( nActiveX, oDA ) hb_gtInfo( HB_GTI_WINTITLE, 'Shell.Explorer.2'+' [ '+'http://www.harbour.vouch.info'+' ]' ) oCom:CLSID := 'Shell.Explorer.2' oCom:mapEvent( 269, {|| QOut( ' E X P L O R E R - 2 6 9' ) } ) - oCom:mapEvent( 105, {|| hb_ToOutDebug( ' E X P L O R E R - 105' ) } ) + 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'+' ]' ) @@ -2785,12 +2781,12 @@ Static Function ExeActiveX( nActiveX, oCom, xParam ) oCom:view := 11 oCom:setBackGroundColor( rgb( 225,225,225 ) ) //oCom:rotate90() -//hb_toOutDebug( str( oCom:getTotalPage() ) ) + endif do while .t. nKey := inkey() -//hb_ToOutDebug( "inkey() %i", nKey ) + IF nActiveX == 2 oCom:Value := seconds()/86400 ENDIF @@ -3597,7 +3593,7 @@ FUNCTION demoxbp() #endif oCom := WvgActiveXControl():New( oDA, , { 0, 0 }, { 100, 100 }, , .t. ) oCom:CLSID := 'newObjects.comctl.VisiLabel' - oCom:mapEvent( 2, {|| hb_ToOutDebug( 'VISILABEE' ) } ) + oCom:mapEvent( 2, {|| WAPI_OutputDebugString( 'VISILABEE' ) } ) oCom:create() oAddr := WvgSLE():new() @@ -4011,65 +4007,6 @@ STATIC FUNCTION FetchText( nMode ) RETURN cText /*----------------------------------------------------------------------*/ -#if 0 -#include "memoedit.ch" -#include "setcurs.ch" -#include "inkey.ch" - -Function Editmemo() - Local cText := 'This is initial text' - Local lEditMode := .f. - - DO WHILE .T. - cText := MEMOEDIT( cText, 3,6,20,76, lEditMode, "EditFunc", 50 ) - if lastkey() == K_ESC - exit - endif - ENDDO - - Return nil -//----------------------------------------------------------------------// -Function EditFunc( nMode, nRow, nCol ) - Local nKey := Lastkey() - - STATIC nLoop := 0 - - nLoop++ - - DO CASE - CASE nMode == ME_INIT - - DO CASE - CASE nLoop == 1 // Set insert mode - SetCursor( SC_SPECIAL1 ) -//hb_ToOutDebug( 'nLoop %i %s', nLoop, 'ME_INIT:K_INS' ) - RETURN K_INS - - OTHERWISE -//hb_ToOutDebug( 'nLoop %i %s', nLoop, 'ME_INIT:OTHERWISE' ) - RETURN ME_DEFAULT - - ENDCASE - - CASE nMode == ME_IDLE -//hb_ToOutDebug( 'nLoop %i %s', nLoop, 'ME_IDLE' ) - - OTHERWISE - IF nKey == K_INS - IF ReadInsert() - SetCursor(SC_NORMAL) - ELSE - SetCursor(SC_SPECIAL1) - ENDIF - - ENDIF -//hb_ToOutDebug( 'nLoop %i %s %i %i', nLoop, 'OTHERWISE', nKey, nMode ) - - ENDCASE - - RETURN ME_DEFAULT -#endif -//----------------------------------------------------------------------// #ifdef __QT__ FUNCTION ExeQTWidgets() LOCAL oPS, oPPrv, oWZ, oCD, oWP diff --git a/harbour/contrib/gtwvg/tests/demoxbp.prg b/harbour/contrib/gtwvg/tests/demoxbp.prg index 64b1b7f8cb..5b28fb28b1 100644 --- a/harbour/contrib/gtwvg/tests/demoxbp.prg +++ b/harbour/contrib/gtwvg/tests/demoxbp.prg @@ -425,7 +425,6 @@ STATIC FUNCTION ExeFontDialog( oCrt ) // Every 2nd FontDialog will be MODAL oWvgFont := oFontDlg:display( ++nMode % 2 ) -// hb_ToOutDebug( '%s %i', oWvgFont:compoundName, oWvgFont:nominalPointSize ) HB_SYMBOL_UNUSED( oWvgFont ) diff --git a/harbour/contrib/hbide/hbide.prg b/harbour/contrib/hbide/hbide.prg index 374509f3da..e738ec3a8f 100644 --- a/harbour/contrib/hbide/hbide.prg +++ b/harbour/contrib/hbide/hbide.prg @@ -530,27 +530,17 @@ METHOD HbIde:setTabImage( cState, oTab ) /*----------------------------------------------------------------------*/ METHOD HbIde:buildTabPage( oWnd, cSource ) - LOCAL oTab, cPath, cFile, cExt, nIndex - LOCAL aPos := { 5,5 } - LOCAL aSize := { 890, 420 } - - DEFAULT cSource TO "Untitled" + LOCAL oTab, cPath, cFile, cExt hb_fNameSplit( cSource, @cPath, @cFile, @cExt ) - oTab := XbpTabPage():new( oWnd, , aPos, aSize, , .t. ) - oTab:caption := cFile + cExt - oTab:minimized := .F. + oTab := XbpTabPage():new( oWnd, , { 5,5 }, { 700,400 }, , .t. ) + oTab:caption := cFile + cExt + oTab:minimized := .F. oTab:create() - nIndex := ::qTabWidget:currentIndex() - IF lower( cExt ) $ ".c;.cpp" - ::setTabImage( "unmodified", oTab ) - ELSE - ::setTabImage( "unmodified", oTab ) - ENDIF - ::qTabWidget:setTabTooltip( nIndex, cSource ) + ::qTabWidget:setTabTooltip( ::qTabWidget:indexOf( QT_PTROFXBP( oTab ) ), cSource ) oTab:tabActivate := {|mp1,mp2,oXbp| ::activateTab( mp1, mp2, oXbp ) } oTab:closeRequested := {|mp1,mp2,oXbp| ::closeTab( mp1, mp2, oXbp ) } @@ -572,6 +562,8 @@ METHOD HbIde:editSource( cSourceFile ) qEdit:setFont( QT_PTROFXBP( ::oFont ) ) qEdit:setTextBackgroundColor( QT_PTROF( QColor():new( 255,255,255 ) ) ) + qDocument := QTextDocument():configure( qEdit:document() ) + qLayout := QBoxLayout():new() qLayout:setDirection( 0 ) qLayout:setContentsMargins( 0,0,0,0 ) @@ -583,7 +575,7 @@ METHOD HbIde:editSource( cSourceFile ) qEdit:show() - aadd( ::aTabs, { oTab, qEdit, qHiliter, qLayout, cSourceFile } ) + aadd( ::aTabs, { oTab, qEdit, qHiliter, qLayout, cSourceFile, qDocument } ) ::nPrevTab := ::nCurTab ::nCurTab := len( ::aTabs ) @@ -594,10 +586,8 @@ METHOD HbIde:editSource( cSourceFile ) ::updateFuncList() ::manageFocusInEditor() - qDocument := QTextDocument():configure( qEdit:document() ) - qDocument:setModified( .f. ) - - Qt_Connect_Signal( QT_PTROF( qEdit ), "textChanged()", {|| ::setTabImage( "modified", oTab ) } ) + Qt_Connect_Signal( QT_PTROF( qEdit ), "textChanged()", ; + {|| ::setTabImage( IF( qDocument:isModified(),"modified","unmodified" ), oTab ) } ) RETURN Self diff --git a/harbour/contrib/xhb/Makefile b/harbour/contrib/xhb/Makefile index ae03ec60f0..ae59e0e230 100644 --- a/harbour/contrib/xhb/Makefile +++ b/harbour/contrib/xhb/Makefile @@ -13,13 +13,13 @@ C_SOURCES := \ cstructc.c \ datesxhb.c \ dbf2txt.c \ - hboutdbg.c \ dbgfxc.c \ filestat.c \ fparse.c \ freadlin.c \ hbcomprs.c \ hbcrypt.c \ + hboutdbg.c \ hbserv.c \ hbsyslog.c \ hbxml.c \