diff --git a/harbour/ChangeLog b/harbour/ChangeLog index ee29c2cf06..78b788fdbc 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,17 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-06-01 18:38 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbqt/qth/QListWidget.qth + * contrib/hbqt/qth/QTableWidget.qth + * contrib/hbqt/qth/QTreeWidget.qth + ! Changed the way destructors should behave under parent's ownership. + + * contrib/hbqt/qtgui/QListWidget.cpp + * contrib/hbqt/qtgui/QTableWidget.cpp + * contrib/hbqt/qtgui/QTreeWidget.cpp + * Regenerated. + 2010-06-01 14:16 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbide/ideharbourhelp.prg ! Fixed a rare occured bug. diff --git a/harbour/contrib/hbqt/qtgui/QListWidget.cpp b/harbour/contrib/hbqt/qtgui/QListWidget.cpp index 0dc9ba4a3c..7b394148ea 100644 --- a/harbour/contrib/hbqt/qtgui/QListWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/QListWidget.cpp @@ -66,12 +66,14 @@ /*----------------------------------------------------------------------*/ /* - * Constructed[ 30/32 [ 93.75% ] ] + * Constructed[ 30/34 [ 88.24% ] ] * * *** Unconvered Prototypes *** * ----------------------------- * + * } * QList findItems ( const QString & text, Qt::MatchFlags flags ) const + * } * QList selectedItems () const */ @@ -176,12 +178,14 @@ HB_FUNC( QT_QLISTWIDGET_ADDITEM ) */ HB_FUNC( QT_QLISTWIDGET_ADDITEM_1 ) { - QListWidget * p = hbqt_par_QListWidget( 1 ); - if( p ) - ( p )->addItem( hbqt_par_QListWidgetItem( 2 ) ); - else + QGC_POINTER * p = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); + QGC_POINTER * q = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QLISTWIDGET_ADDITEM()" ) ); + if( p && p->ph && q && q->ph ) { - HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QLISTWIDGET_ADDITEM_1 FP=( p )->addItem( hbqt_par_QListWidgetItem( 2 ) ); p is NULL" ) ); + HB_TRACE( HB_TR_DEBUG, ( "QT_QLISTWIDGET_ADDITEM() Qt object: %p is attached to: %p", p->ph, q->ph ) ); + q->bNew = HB_FALSE; + hbqt_par_QListWidget( 1 )->addItem( hbqt_par_QListWidgetItem( 2 ) ); } } @@ -274,12 +278,14 @@ HB_FUNC( QT_QLISTWIDGET_EDITITEM ) */ HB_FUNC( QT_QLISTWIDGET_INSERTITEM ) { - QListWidget * p = hbqt_par_QListWidget( 1 ); - if( p ) - ( p )->insertItem( hb_parni( 2 ), hbqt_par_QListWidgetItem( 3 ) ); - else + QGC_POINTER * p = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); + QGC_POINTER * q = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 3 ); + HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QLISTWIDGET_INSERTITEM()" ) ); + if( p && p->ph && q && q->ph ) { - HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QLISTWIDGET_INSERTITEM FP=( p )->insertItem( hb_parni( 2 ), hbqt_par_QListWidgetItem( 3 ) ); p is NULL" ) ); + HB_TRACE( HB_TR_DEBUG, ( "QT_QLISTWIDGET_INSERTITEM() Qt object: %p is attached to: %p", p->ph, q->ph ) ); + q->bNew = HB_FALSE; + hbqt_par_QListWidget( 1 )->insertItem( hb_parni( 2 ), hbqt_par_QListWidgetItem( 3 ) ); } } diff --git a/harbour/contrib/hbqt/qtgui/QTableWidget.cpp b/harbour/contrib/hbqt/qtgui/QTableWidget.cpp index 1accf29d77..b8e747c89f 100644 --- a/harbour/contrib/hbqt/qtgui/QTableWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/QTableWidget.cpp @@ -66,7 +66,7 @@ /*----------------------------------------------------------------------*/ /* - * Constructed[ 46/49 [ 93.88% ] ] + * Constructed[ 46/53 [ 86.79% ] ] * * *** Unconvered Prototypes *** * ----------------------------- @@ -74,6 +74,10 @@ * QList findItems ( const QString & text, Qt::MatchFlags flags ) const * QList selectedItems () * QList selectedRanges () const + * } + * } + * } + * } */ #include @@ -461,12 +465,14 @@ HB_FUNC( QT_QTABLEWIDGET_SETCURRENTCELL_1 ) */ HB_FUNC( QT_QTABLEWIDGET_SETCURRENTITEM ) { - QTableWidget * p = hbqt_par_QTableWidget( 1 ); - if( p ) - ( p )->setCurrentItem( hbqt_par_QTableWidgetItem( 2 ) ); - else + QGC_POINTER * p = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); + QGC_POINTER * q = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QTABLEWIDGET_SETCURRENTITEM()" ) ); + if( p && p->ph && q && q->ph ) { - HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTABLEWIDGET_SETCURRENTITEM FP=( p )->setCurrentItem( hbqt_par_QTableWidgetItem( 2 ) ); p is NULL" ) ); + HB_TRACE( HB_TR_DEBUG, ( "QT_QTABLEWIDGET_SETCURRENTITEM() Qt object: %p is attached to: %p", p->ph, q->ph ) ); + q->bNew = HB_FALSE; + hbqt_par_QTableWidget( 1 )->setCurrentItem( hbqt_par_QTableWidgetItem( 2 ) ); } } @@ -475,12 +481,14 @@ HB_FUNC( QT_QTABLEWIDGET_SETCURRENTITEM ) */ HB_FUNC( QT_QTABLEWIDGET_SETCURRENTITEM_1 ) { - QTableWidget * p = hbqt_par_QTableWidget( 1 ); - if( p ) - ( p )->setCurrentItem( hbqt_par_QTableWidgetItem( 2 ), ( QItemSelectionModel::SelectionFlags ) hb_parni( 3 ) ); - else + QGC_POINTER * p = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); + QGC_POINTER * q = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QTABLEWIDGET_SETCURRENTITEM_1()" ) ); + if( p && p->ph && q && q->ph ) { - HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTABLEWIDGET_SETCURRENTITEM_1 FP=( p )->setCurrentItem( hbqt_par_QTableWidgetItem( 2 ), ( QItemSelectionModel::SelectionFlags ) hb_parni( 3 ) ); p is NULL" ) ); + HB_TRACE( HB_TR_DEBUG, ( "QT_QTABLEWIDGET_SETCURRENTITEM_1() Qt object: %p is attached to: %p", p->ph, q->ph ) ); + q->bNew = HB_FALSE; + hbqt_par_QTableWidget( 1 )->setCurrentItem( hbqt_par_QTableWidgetItem( 2 ), ( QItemSelectionModel::SelectionFlags ) hb_parni( 2 ) ); } } @@ -489,12 +497,14 @@ HB_FUNC( QT_QTABLEWIDGET_SETCURRENTITEM_1 ) */ HB_FUNC( QT_QTABLEWIDGET_SETHORIZONTALHEADERITEM ) { - QTableWidget * p = hbqt_par_QTableWidget( 1 ); - if( p ) - ( p )->setHorizontalHeaderItem( hb_parni( 2 ), hbqt_par_QTableWidgetItem( 3 ) ); - else + QGC_POINTER * p = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); + QGC_POINTER * q = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 3 ); + HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QTABLEWIDGET_SETHORIZONTALHEADERITEM()" ) ); + if( p && p->ph && q && q->ph ) { - HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTABLEWIDGET_SETHORIZONTALHEADERITEM FP=( p )->setHorizontalHeaderItem( hb_parni( 2 ), hbqt_par_QTableWidgetItem( 3 ) ); p is NULL" ) ); + HB_TRACE( HB_TR_DEBUG, ( "QT_QTABLEWIDGET_SETHORIZONTALHEADERITEM() Qt object: %p is attached to: %p", p->ph, q->ph ) ); + q->bNew = HB_FALSE; + hbqt_par_QTableWidget( 1 )->setHorizontalHeaderItem( hb_parni( 2 ), hbqt_par_QTableWidgetItem( 3 ) ); } } @@ -573,12 +583,14 @@ HB_FUNC( QT_QTABLEWIDGET_SETROWCOUNT ) */ HB_FUNC( QT_QTABLEWIDGET_SETVERTICALHEADERITEM ) { - QTableWidget * p = hbqt_par_QTableWidget( 1 ); - if( p ) - ( p )->setVerticalHeaderItem( hb_parni( 2 ), hbqt_par_QTableWidgetItem( 3 ) ); - else + QGC_POINTER * p = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); + QGC_POINTER * q = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 3 ); + HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QTABLEWIDGET_SETVERTICALHEADERITEM()" ) ); + if( p && p->ph && q && q->ph ) { - HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTABLEWIDGET_SETVERTICALHEADERITEM FP=( p )->setVerticalHeaderItem( hb_parni( 2 ), hbqt_par_QTableWidgetItem( 3 ) ); p is NULL" ) ); + HB_TRACE( HB_TR_DEBUG, ( "QT_QTABLEWIDGET_SETVERTICALHEADERITEM() Qt object: %p is attached to: %p", p->ph, q->ph ) ); + q->bNew = HB_FALSE; + hbqt_par_QTableWidget( 1 )->setVerticalHeaderItem( hb_parni( 2 ), hbqt_par_QTableWidgetItem( 3 ) ); } } diff --git a/harbour/contrib/hbqt/qtgui/QTreeWidget.cpp b/harbour/contrib/hbqt/qtgui/QTreeWidget.cpp index c5eb417514..a7ae4c75a3 100644 --- a/harbour/contrib/hbqt/qtgui/QTreeWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/QTreeWidget.cpp @@ -66,7 +66,7 @@ /*----------------------------------------------------------------------*/ /* - * Constructed[ 37/41 [ 90.24% ] ] + * Constructed[ 37/45 [ 82.22% ] ] * * *** Unconvered Prototypes *** * ----------------------------- @@ -75,6 +75,10 @@ * QList findItems ( const QString & text, Qt::MatchFlags flags, int column = 0 ) const * void insertTopLevelItems ( int index, const QList & items ) * QList selectedItems () const + * } + * } + * } + * } */ #include @@ -430,12 +434,14 @@ HB_FUNC( QT_QTREEWIDGET_SETCOLUMNCOUNT ) */ HB_FUNC( QT_QTREEWIDGET_SETCURRENTITEM ) { - QTreeWidget * p = hbqt_par_QTreeWidget( 1 ); - if( p ) - ( p )->setCurrentItem( hbqt_par_QTreeWidgetItem( 2 ) ); - else + QGC_POINTER * p = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); + QGC_POINTER * q = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QTREEWIDGET_SETCURRENTITEM()" ) ); + if( p && p->ph && q && q->ph ) { - HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTREEWIDGET_SETCURRENTITEM FP=( p )->setCurrentItem( hbqt_par_QTreeWidgetItem( 2 ) ); p is NULL" ) ); + HB_TRACE( HB_TR_DEBUG, ( "QT_QTREEWIDGET_SETCURRENTITEM() Qt object: %p is attached to: %p", p->ph, q->ph ) ); + q->bNew = HB_FALSE; + hbqt_par_QTreeWidget( 1 )->setCurrentItem( hbqt_par_QTreeWidgetItem( 2 ) ); } } @@ -444,12 +450,14 @@ HB_FUNC( QT_QTREEWIDGET_SETCURRENTITEM ) */ HB_FUNC( QT_QTREEWIDGET_SETCURRENTITEM_1 ) { - QTreeWidget * p = hbqt_par_QTreeWidget( 1 ); - if( p ) - ( p )->setCurrentItem( hbqt_par_QTreeWidgetItem( 2 ), hb_parni( 3 ) ); - else + QGC_POINTER * p = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); + QGC_POINTER * q = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QTREEWIDGET_SETCURRENTITEM_1()" ) ); + if( p && p->ph && q && q->ph ) { - HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTREEWIDGET_SETCURRENTITEM_1 FP=( p )->setCurrentItem( hbqt_par_QTreeWidgetItem( 2 ), hb_parni( 3 ) ); p is NULL" ) ); + HB_TRACE( HB_TR_DEBUG, ( "QT_QTREEWIDGET_SETCURRENTITEM_1() Qt object: %p is attached to: %p", p->ph, q->ph ) ); + q->bNew = HB_FALSE; + hbqt_par_QTreeWidget( 1 )->setCurrentItem( hbqt_par_QTreeWidgetItem( 2 ), hb_parni( 3 ) ); } } @@ -458,12 +466,14 @@ HB_FUNC( QT_QTREEWIDGET_SETCURRENTITEM_1 ) */ HB_FUNC( QT_QTREEWIDGET_SETCURRENTITEM_2 ) { - QTreeWidget * p = hbqt_par_QTreeWidget( 1 ); - if( p ) - ( p )->setCurrentItem( hbqt_par_QTreeWidgetItem( 2 ), hb_parni( 3 ), ( QItemSelectionModel::SelectionFlags ) hb_parni( 4 ) ); - else + QGC_POINTER * p = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); + QGC_POINTER * q = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QTREEWIDGET_SETCURRENTITEM_2()" ) ); + if( p && p->ph && q && q->ph ) { - HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTREEWIDGET_SETCURRENTITEM_2 FP=( p )->setCurrentItem( hbqt_par_QTreeWidgetItem( 2 ), hb_parni( 3 ), ( QItemSelectionModel::SelectionFlags ) hb_parni( 4 ) ); p is NULL" ) ); + HB_TRACE( HB_TR_DEBUG, ( "QT_QTREEWIDGET_SETCURRENTITEM_2() Qt object: %p is attached to: %p", p->ph, q->ph ) ); + q->bNew = HB_FALSE; + hbqt_par_QTreeWidget( 1 )->setCurrentItem( hbqt_par_QTreeWidgetItem( 2 ), hb_parni( 3 ), ( QItemSelectionModel::SelectionFlags ) hb_parni( 4 ) ); } } @@ -486,12 +496,14 @@ HB_FUNC( QT_QTREEWIDGET_SETFIRSTITEMCOLUMNSPANNED ) */ HB_FUNC( QT_QTREEWIDGET_SETHEADERITEM ) { - QTreeWidget * p = hbqt_par_QTreeWidget( 1 ); - if( p ) - ( p )->setHeaderItem( hbqt_par_QTreeWidgetItem( 2 ) ); - else + QGC_POINTER * p = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); + QGC_POINTER * q = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QTREEWIDGET_SETHEADERITEM()" ) ); + if( p && p->ph && q && q->ph ) { - HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTREEWIDGET_SETHEADERITEM FP=( p )->setHeaderItem( hbqt_par_QTreeWidgetItem( 2 ) ); p is NULL" ) ); + HB_TRACE( HB_TR_DEBUG, ( "QT_QTREEWIDGET_SETHEADERITEM() Qt object: %p is attached to: %p", p->ph, q->ph ) ); + q->bNew = HB_FALSE; + hbqt_par_QTreeWidget( 1 )->setHeaderItem( hbqt_par_QTreeWidgetItem( 2 ) ); } } diff --git a/harbour/contrib/hbqt/qth/QListWidget.qth b/harbour/contrib/hbqt/qth/QListWidget.qth index 464304c3a6..5f8843d85b 100644 --- a/harbour/contrib/hbqt/qth/QListWidget.qth +++ b/harbour/contrib/hbqt/qth/QListWidget.qth @@ -75,7 +75,17 @@ HB_FUNC( QT_QLISTWIDGET ) void addItem ( const QString & label ) -void addItem ( QListWidgetItem * item ) +void addItem ( QListWidgetItem * item ){ + QGC_POINTER * p = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); + QGC_POINTER * q = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QLISTWIDGET_ADDITEM()" ) ); + if( p && p->ph && q && q->ph ) + { + HB_TRACE( HB_TR_DEBUG, ( "QT_QLISTWIDGET_ADDITEM() Qt object: %p is attached to: %p", p->ph, q->ph ) ); + q->bNew = HB_FALSE; + hbqt_par_QListWidget( 1 )->addItem( hbqt_par_QListWidgetItem( 2 ) ); + } +} void addItems ( const QStringList & labels ) void closePersistentEditor ( QListWidgetItem * item ) int count () const @@ -83,7 +93,17 @@ QListWidgetItem * currentItem () const int currentRow () const void editItem ( QListWidgetItem * item ) QList findItems ( const QString & text, Qt::MatchFlags flags ) const -void insertItem ( int row, QListWidgetItem * item ) +void insertItem ( int row, QListWidgetItem * item ){ + QGC_POINTER * p = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); + QGC_POINTER * q = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 3 ); + HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QLISTWIDGET_INSERTITEM()" ) ); + if( p && p->ph && q && q->ph ) + { + HB_TRACE( HB_TR_DEBUG, ( "QT_QLISTWIDGET_INSERTITEM() Qt object: %p is attached to: %p", p->ph, q->ph ) ); + q->bNew = HB_FALSE; + hbqt_par_QListWidget( 1 )->insertItem( hb_parni( 2 ), hbqt_par_QListWidgetItem( 3 ) ); + } +} void insertItem ( int row, const QString & label ) void insertItems ( int row, const QStringList & labels ) bool isSortingEnabled () const diff --git a/harbour/contrib/hbqt/qth/QTableWidget.qth b/harbour/contrib/hbqt/qth/QTableWidget.qth index 6518b72604..edf4ce1c9a 100644 --- a/harbour/contrib/hbqt/qth/QTableWidget.qth +++ b/harbour/contrib/hbqt/qth/QTableWidget.qth @@ -102,15 +102,61 @@ void setCellWidget ( int row, int column, QWidget * widget ) void setColumnCount ( int columns ) void setCurrentCell ( int row, int column ) void setCurrentCell ( int row, int column, QItemSelectionModel::SelectionFlags command ) -void setCurrentItem ( QTableWidgetItem * item ) -void setCurrentItem ( QTableWidgetItem * item, QItemSelectionModel::SelectionFlags command ) -void setHorizontalHeaderItem ( int column, QTableWidgetItem * item ) + +void setCurrentItem ( QTableWidgetItem * item ){ + QGC_POINTER * p = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); + QGC_POINTER * q = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QTABLEWIDGET_SETCURRENTITEM()" ) ); + if( p && p->ph && q && q->ph ) + { + HB_TRACE( HB_TR_DEBUG, ( "QT_QTABLEWIDGET_SETCURRENTITEM() Qt object: %p is attached to: %p", p->ph, q->ph ) ); + q->bNew = HB_FALSE; + hbqt_par_QTableWidget( 1 )->setCurrentItem( hbqt_par_QTableWidgetItem( 2 ) ); + } +} + +void setCurrentItem ( QTableWidgetItem * item, QItemSelectionModel::SelectionFlags command ){ + QGC_POINTER * p = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); + QGC_POINTER * q = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QTABLEWIDGET_SETCURRENTITEM_1()" ) ); + if( p && p->ph && q && q->ph ) + { + HB_TRACE( HB_TR_DEBUG, ( "QT_QTABLEWIDGET_SETCURRENTITEM_1() Qt object: %p is attached to: %p", p->ph, q->ph ) ); + q->bNew = HB_FALSE; + hbqt_par_QTableWidget( 1 )->setCurrentItem( hbqt_par_QTableWidgetItem( 2 ), ( QItemSelectionModel::SelectionFlags ) hb_parni( 2 ) ); + } +} + +void setHorizontalHeaderItem ( int column, QTableWidgetItem * item ){ + QGC_POINTER * p = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); + QGC_POINTER * q = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 3 ); + HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QTABLEWIDGET_SETHORIZONTALHEADERITEM()" ) ); + if( p && p->ph && q && q->ph ) + { + HB_TRACE( HB_TR_DEBUG, ( "QT_QTABLEWIDGET_SETHORIZONTALHEADERITEM() Qt object: %p is attached to: %p", p->ph, q->ph ) ); + q->bNew = HB_FALSE; + hbqt_par_QTableWidget( 1 )->setHorizontalHeaderItem( hb_parni( 2 ), hbqt_par_QTableWidgetItem( 3 ) ); + } +} + void setHorizontalHeaderLabels ( const QStringList & labels ) void setItem ( int row, int column, QTableWidgetItem * item ) void setItemPrototype ( const QTableWidgetItem * item ) void setRangeSelected ( const QTableWidgetSelectionRange & range, bool select ) void setRowCount ( int rows ) -void setVerticalHeaderItem ( int row, QTableWidgetItem * item ) + +void setVerticalHeaderItem ( int row, QTableWidgetItem * item ){ + QGC_POINTER * p = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); + QGC_POINTER * q = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 3 ); + HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QTABLEWIDGET_SETVERTICALHEADERITEM()" ) ); + if( p && p->ph && q && q->ph ) + { + HB_TRACE( HB_TR_DEBUG, ( "QT_QTABLEWIDGET_SETVERTICALHEADERITEM() Qt object: %p is attached to: %p", p->ph, q->ph ) ); + q->bNew = HB_FALSE; + hbqt_par_QTableWidget( 1 )->setVerticalHeaderItem( hb_parni( 2 ), hbqt_par_QTableWidgetItem( 3 ) ); + } +} + void setVerticalHeaderLabels ( const QStringList & labels ) void sortItems ( int column, Qt::SortOrder order = Qt::AscendingOrder ) QTableWidgetItem * takeHorizontalHeaderItem ( int column ) diff --git a/harbour/contrib/hbqt/qth/QTreeWidget.qth b/harbour/contrib/hbqt/qth/QTreeWidget.qth index 0c3734721e..e2079da55d 100644 --- a/harbour/contrib/hbqt/qth/QTreeWidget.qth +++ b/harbour/contrib/hbqt/qth/QTreeWidget.qth @@ -97,11 +97,57 @@ void openPersistentEditor ( QTreeWidgetItem * item, int column = 0 ) void removeItemWidget ( QTreeWidgetItem * item, int column ) QList selectedItems () const void setColumnCount ( int columns ) -void setCurrentItem ( QTreeWidgetItem * item ) -void setCurrentItem ( QTreeWidgetItem * item, int column ) -void setCurrentItem ( QTreeWidgetItem * item, int column, QItemSelectionModel::SelectionFlags command ) + +void setCurrentItem ( QTreeWidgetItem * item ){ + QGC_POINTER * p = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); + QGC_POINTER * q = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QTREEWIDGET_SETCURRENTITEM()" ) ); + if( p && p->ph && q && q->ph ) + { + HB_TRACE( HB_TR_DEBUG, ( "QT_QTREEWIDGET_SETCURRENTITEM() Qt object: %p is attached to: %p", p->ph, q->ph ) ); + q->bNew = HB_FALSE; + hbqt_par_QTreeWidget( 1 )->setCurrentItem( hbqt_par_QTreeWidgetItem( 2 ) ); + } +} + +void setCurrentItem ( QTreeWidgetItem * item, int column ){ + QGC_POINTER * p = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); + QGC_POINTER * q = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QTREEWIDGET_SETCURRENTITEM_1()" ) ); + if( p && p->ph && q && q->ph ) + { + HB_TRACE( HB_TR_DEBUG, ( "QT_QTREEWIDGET_SETCURRENTITEM_1() Qt object: %p is attached to: %p", p->ph, q->ph ) ); + q->bNew = HB_FALSE; + hbqt_par_QTreeWidget( 1 )->setCurrentItem( hbqt_par_QTreeWidgetItem( 2 ), hb_parni( 3 ) ); + } +} + +void setCurrentItem ( QTreeWidgetItem * item, int column, QItemSelectionModel::SelectionFlags command ){ + QGC_POINTER * p = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); + QGC_POINTER * q = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QTREEWIDGET_SETCURRENTITEM_2()" ) ); + if( p && p->ph && q && q->ph ) + { + HB_TRACE( HB_TR_DEBUG, ( "QT_QTREEWIDGET_SETCURRENTITEM_2() Qt object: %p is attached to: %p", p->ph, q->ph ) ); + q->bNew = HB_FALSE; + hbqt_par_QTreeWidget( 1 )->setCurrentItem( hbqt_par_QTreeWidgetItem( 2 ), hb_parni( 3 ), ( QItemSelectionModel::SelectionFlags ) hb_parni( 4 ) ); + } +} + void setFirstItemColumnSpanned ( const QTreeWidgetItem * item, bool span ) -void setHeaderItem ( QTreeWidgetItem * item ) + +void setHeaderItem ( QTreeWidgetItem * item ){ + QGC_POINTER * p = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); + QGC_POINTER * q = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QTREEWIDGET_SETHEADERITEM()" ) ); + if( p && p->ph && q && q->ph ) + { + HB_TRACE( HB_TR_DEBUG, ( "QT_QTREEWIDGET_SETHEADERITEM() Qt object: %p is attached to: %p", p->ph, q->ph ) ); + q->bNew = HB_FALSE; + hbqt_par_QTreeWidget( 1 )->setHeaderItem( hbqt_par_QTreeWidgetItem( 2 ) ); + } +} + void setHeaderLabel ( const QString & label ) void setHeaderLabels ( const QStringList & labels ) void setItemWidget ( QTreeWidgetItem * item, int column, QWidget * widget )