diff --git a/harbour/ChangeLog b/harbour/ChangeLog index e0804d6339..0c413f2052 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,11 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-12-09 08:07 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) + * contrib/hbide/hbide.prg + * contrib/hbxbp/xbpdataref.prg + ! Fix in XbpMLE():setData() method, omitted in prev change. + 2009-12-09 16:43 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbwin/olecore.c * Changed to use HB_SIZE instead of ULONG. diff --git a/harbour/contrib/hbide/hbide.prg b/harbour/contrib/hbide/hbide.prg index cfd2a9492d..f4857a167b 100644 --- a/harbour/contrib/hbide/hbide.prg +++ b/harbour/contrib/hbide/hbide.prg @@ -625,15 +625,15 @@ METHOD HbIde:editSource( cSourceFile, nPos, nHPos, nVPos ) ::qCursor := QTextCursor():configure( qEdit:textCursor() ) ::qCursor:setPosition( nPos ) // - qHScr := QScrollBar():configure( qEdit:horizontalScrollBar() ) + qHScr := QScrollBar():configure( qEdit:horizontalScrollBar() ) qHScr:setValue( nHPos ) // - qVScr := QScrollBar():configure( qEdit:verticalScrollBar() ) + qVScr := QScrollBar():configure( qEdit:verticalScrollBar() ) qVScr:setValue( nVPos ) aadd( ::aTabs, { oTab, qEdit, qHiliter, qLayout, cSourceFile, qDocument } ) - ::nCurTab := len( ::aTabs ) + ::nCurTab := len( ::aTabs ) ::aSources := { cSourceFile } ::createTags() @@ -1856,7 +1856,7 @@ METHOD HbIde:buildProject( cProject ) hb_processRun( cCmd, , @cOutput, @cErrors ) - ::oOutputResult:setData( cOutput + CRLF + CRLF + cErrors ) + ::oOutputResult:oWidget:appendPlainText( cOutput + CRLF + IF( empty( cErrors ), "", cErrors ) ) RETURN Self @@ -1888,7 +1888,7 @@ METHOD HbIde:buildProjectViaQt( cProject ) ::qProcess:setReadChannel( 0 ) Qt_Connect_Signal( QT_PTROF( ::qProcess ), "readyReadStandardOutput()", {|o,i| ::readProcessInfo( 3, i, o ) } ) - Qt_Connect_Signal( QT_PTROF( ::qProcess ), "finished(int,int)", {|o,i| ::readProcessInfo( 2, i, o ) } ) + Qt_Connect_Signal( QT_PTROF( ::qProcess ), "finished(int,int)" , {|o,i| ::readProcessInfo( 2, i, o ) } ) ::qProcess:start( "hbmk2.exe", QT_PTROF( qStringList ) ) diff --git a/harbour/contrib/hbxbp/xbpdataref.prg b/harbour/contrib/hbxbp/xbpdataref.prg index 252ef7072a..1ce142beed 100644 --- a/harbour/contrib/hbxbp/xbpdataref.prg +++ b/harbour/contrib/hbxbp/xbpdataref.prg @@ -110,7 +110,10 @@ METHOD XbpDataRef:getData() LOCAL cClass := __ObjGetClsName( self ) DO CASE - CASE cClass $ "XBPSLE,XBPMLE" + CASE cClass $ "XBPMLE" + ::sl_editBuffer := ::oWidget:toPlainText() + + CASE cClass $ "XBPSLE" ::sl_editBuffer := ::oWidget:text() // CASE cClass $ "XBPCOMBOBOX" @@ -171,10 +174,14 @@ METHOD XbpDataRef:setData( xValue, mp2 ) //Win_TreeView_SelectItem( ::hWnd, ::sl_editBuffer:hItem ) ENDIF - CASE cClass $ "XBPSLE,XBPMLE" + CASE cClass $ "XBPSLE" IF hb_isChar( ::sl_editBuffer ) ::oWidget:setText( ::sl_editBuffer ) ENDIF + CASE cClass $ "XBPMLE" + IF hb_isChar( ::sl_editBuffer ) + ::oWidget:setPlainText( ::sl_editBuffer ) + ENDIF #if 0 CASE cClass $ "XBPCOMBOBOX" IF hb_isChar( ::sl_editBuffer )