diff --git a/harbour/ChangeLog b/harbour/ChangeLog index e1de85d7eb..9db1366875 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,12 @@ The license applies to all entries newer than 2009-04-28. */ +2010-06-14 21:31 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbqt/qth/HBQPlainTextEdit.qth + * contrib/hbqt/qth/HBQSyntaxHighLighter.qth + * contrib/hbqt/qth/QTableWidget.qth + ! Restored the changed effected with r14752. + 2010-06-14 19:27 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbide/idedocks.prg * contrib/hbide/idestylesheets.prg diff --git a/harbour/contrib/hbqt/qth/HBQPlainTextEdit.qth b/harbour/contrib/hbqt/qth/HBQPlainTextEdit.qth index 1a7459ee8f..163dee9cd8 100644 --- a/harbour/contrib/hbqt/qth/HBQPlainTextEdit.qth +++ b/harbour/contrib/hbqt/qth/HBQPlainTextEdit.qth @@ -147,6 +147,8 @@ HB_FUNC( QT_HBQPLAINTEXTEDIT ) void hbApplyKey( int key, Qt::KeyboardModifiers modifiers = 0, const QString & txt ) void hbHighlightArea( int top, int left, int bottom, int right, int mode ) void hbTogglePersistentSelection() + void hbHorzRulerVisible( bool visible ) + diff --git a/harbour/contrib/hbqt/qth/HBQSyntaxHighLighter.qth b/harbour/contrib/hbqt/qth/HBQSyntaxHighLighter.qth index 500abb14b3..1985bb388b 100644 --- a/harbour/contrib/hbqt/qth/HBQSyntaxHighLighter.qth +++ b/harbour/contrib/hbqt/qth/HBQSyntaxHighLighter.qth @@ -91,6 +91,7 @@ void hbSetSingleLineCommentFormat( const QTextCharFormat & format ) void hbSetRule( QString name, QString pattern, QTextCharFormat & format ) void hbSetFormat( QString name, const QTextCharFormat & format ) void hbSetFormatColumnSelection( int start, int count, const QColor & color ) +void hbSetRuleWithRegExp( QString name, const QRegExp & reg, const QTextCharFormat & format ) # QTextBlock currentBlock () const # int currentBlockState () const diff --git a/harbour/contrib/hbqt/qth/QTableWidget.qth b/harbour/contrib/hbqt/qth/QTableWidget.qth index edf4ce1c9a..3e1abf073a 100644 --- a/harbour/contrib/hbqt/qth/QTableWidget.qth +++ b/harbour/contrib/hbqt/qth/QTableWidget.qth @@ -140,7 +140,19 @@ void setHorizontalHeaderItem ( int column, QTableWidgetItem * item ){ } void setHorizontalHeaderLabels ( const QStringList & labels ) -void setItem ( int row, int column, QTableWidgetItem * item ) + +void setItem ( int row, int column, QTableWidgetItem * item ){ + QGC_POINTER * p = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); + QGC_POINTER * q = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 4 ); + HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QTABLEWIDGET_SETITEM()" ) ); + if( p && p->ph && q && q->ph ) + { + HB_TRACE( HB_TR_DEBUG, ( "QT_QTABLEWIDGET_SETITEM() Qt object: %p is attached to: %p", p->ph, q->ph ) ); + q->bNew = HB_FALSE; + hbqt_par_QTableWidget( 1 )->setItem( hb_parni( 2 ), hb_parni( 3 ), hbqt_par_QTableWidgetItem( 4 ) ); + } +} + void setItemPrototype ( const QTableWidgetItem * item ) void setRangeSelected ( const QTableWidgetSelectionRange & range, bool select ) void setRowCount ( int rows )