From a6425dc14606ba7fa0eea8f92eabc597d0308450 Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Sun, 3 Apr 2011 00:26:59 +0000 Subject: [PATCH] 2011-04-02 17:22 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbqt/qtgui/qth/QDockWidget.qth * contrib/hbqt/qtgui/qth/QLayout.qth * contrib/hbqt/qtgui/qth/QWidget.qth ! Modified: constructors, detatchment, attachment. --- harbour/ChangeLog | 6 ++++++ harbour/contrib/hbqt/qtgui/qth/QDockWidget.qth | 9 ++++++++- harbour/contrib/hbqt/qtgui/qth/QLayout.qth | 4 ++-- harbour/contrib/hbqt/qtgui/qth/QWidget.qth | 2 +- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 56fa292631..241f5647a6 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,12 @@ The license applies to all entries newer than 2009-04-28. */ +2011-04-02 17:22 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbqt/qtgui/qth/QDockWidget.qth + * contrib/hbqt/qtgui/qth/QLayout.qth + * contrib/hbqt/qtgui/qth/QWidget.qth + ! Modified: constructors, detatchment, attachment. + 2011-04-01 17:09 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbqt/hbmk2_qt.hbs ! Optimized: hb_itemReturn( hb_stackSelfItem() ); diff --git a/harbour/contrib/hbqt/qtgui/qth/QDockWidget.qth b/harbour/contrib/hbqt/qtgui/qth/QDockWidget.qth index 7c478e606e..ba3fb2306b 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QDockWidget.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QDockWidget.qth @@ -27,7 +27,14 @@ New = pParent */ HB_FUNC( QT_QDOCKWIDGET ) { - __HB_RETPTRGC__( new QDockWidget( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) ); + if( hb_pcount() >= 1 && HB_ISCHAR( 1 ) ) + { + __HB_RETPTRGC__( new QDockWidget( hbqt_par_QString( 1 ), ( HB_ISOBJECT( 2 ) ? hbqt_par_QWidget( 2 ) : 0 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) ); + } + else + { + __HB_RETPTRGC__( new QDockWidget( ( HB_ISOBJECT( 1 ) ? hbqt_par_QWidget( 1 ) : 0 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) ); + } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QLayout.qth b/harbour/contrib/hbqt/qtgui/qth/QLayout.qth index 32ad3c4506..7d61f6ad16 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QLayout.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QLayout.qth @@ -38,7 +38,7 @@ enum SizeConstraint { SetDefaultConstraint, SetFixedSize, SetMinimumSize, SetMax bool activate () virtual void addItem ( QLayoutItem * item ) [*D=1*] -void addWidget ( QWidget * w ) +void addWidget ( QWidget * w ) [*D=1*] QRect contentsRect () const virtual int count () const = 0 virtual Qt::Orientations expandingDirections () const @@ -51,7 +51,7 @@ QWidget * menuBar () const virtual QSize minimumSize () const QWidget * parentWidget () const void removeItem ( QLayoutItem * item ) [*A=1*] -void removeWidget ( QWidget * widget ) +void removeWidget ( QWidget * widget ) [*A=1*] bool setAlignment ( QWidget * w, Qt::Alignment alignment ) void setAlignment ( Qt::Alignment alignment ) bool setAlignment ( QLayout * l, Qt::Alignment alignment ) diff --git a/harbour/contrib/hbqt/qtgui/qth/QWidget.qth b/harbour/contrib/hbqt/qtgui/qth/QWidget.qth index 580d06b8bd..4cad74e4c6 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QWidget.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QWidget.qth @@ -201,7 +201,7 @@ void setGeometry ( const QRect & ) void setGeometry ( int x, int y, int w, int h ) // void setInputContext ( QInputContext * context ) -void setLayout ( QLayout * layout ) +void setLayout ( QLayout * layout ) [*D=1*] void setLayoutDirection ( Qt::LayoutDirection direction ) void setLocale ( const QLocale & locale )